Skip to content

Commit 637c25f

Browse files
tomitomi3tomitomi3
committed
整理
1 parent b6701ca commit 637c25f

37 files changed

+1242
-594
lines changed

‎LibOptimization/LibOptimization.vbproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
<Compile Include="Optimization\clsOptPSO.vb" />
127127
<Compile Include="Optimization\clsOptRealGAUNDX.vb" />
128128
<Compile Include="Optimization\clsOptSimulatedAnnealing.vb" />
129-
<Compile Include="Optimization\clsOptTemplate.vb" />
130-
<Compile Include="Optimization\clsParticle.vb" />
131-
<Compile Include="Optimization\clsFireFly.vb" />
129+
<Compile Include="Optimization\parts\clsOptTemplate.vb" />
130+
<Compile Include="Optimization\parts\clsParticle.vb" />
131+
<Compile Include="Optimization\parts\clsFireFly.vb" />
132132
<Compile Include="Util\clsEval.vb" />
133133
<Compile Include="EasyLinearAlgebra\clsException.vb" />
134134
<Compile Include="EasyLinearAlgebra\clsEasyMatrix.vb" />
@@ -153,7 +153,7 @@
153153
<Compile Include="Optimization\clsOptPatternSearch.vb" />
154154
<Compile Include="Optimization\clsOptNelderMead.vb" />
155155
<Compile Include="Optimization\clsOptRealGAREX.vb" />
156-
<Compile Include="Optimization\clsPoint.vb" />
156+
<Compile Include="Optimization\parts\clsPoint.vb" />
157157
<Compile Include="Optimization\clsOptSteepestDescent.vb" />
158158
<Compile Include="Optimization\clsOptNewtonMethod.vb" />
159159
<Compile Include="Util\clsUtil.vb" />

‎LibOptimization/My Project/AssemblyInfo.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' 既定値にすることができます:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("1.12.0.0")>
35-
<Assembly: AssemblyFileVersion("1.12.0.0")>
34+
<Assembly: AssemblyVersion("1.13.0.0")>
35+
<Assembly: AssemblyFileVersion("1.13.0.0")>

‎LibOptimization/Optimization/clsFireFly.vb‎ renamed to ‎LibOptimization/Optimization/parts/clsFireFly.vb‎

File renamed without changes.

‎LibOptimization/Optimization/clsOptTemplate.vb‎ renamed to ‎LibOptimization/Optimization/parts/clsOptTemplate.vb‎

File renamed without changes.

‎LibOptimization/Optimization/clsParticle.vb‎ renamed to ‎LibOptimization/Optimization/parts/clsParticle.vb‎

File renamed without changes.

‎LibOptimization/Optimization/clsPoint.vb‎ renamed to ‎LibOptimization/Optimization/parts/clsPoint.vb‎

File renamed without changes.

‎LibOptimization/Util/clsUtil.vb‎

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,5 +552,151 @@ Namespace Util
552552
End If
553553
End If
554554
End Sub
555+
556+
''' <summary>
557+
''' optimizer for UnitTest
558+
''' </summary>
559+
''' <param name="func"></param>
560+
''' <returns></returns>
561+
Public Shared Function GetOptimizersForUnitTest(ByVal func As absObjectiveFunction) As List(Of absOptimization)
562+
Dim optimizers As New List(Of absOptimization)
563+
With Nothing
564+
Dim optCs = New clsOptCS(func)
565+
optimizers.Add(optCs)
566+
End With
567+
With Nothing
568+
Dim optDE_b_1_b = New clsOptDE(func)
569+
optDE_b_1_b.DEStrategy = clsOptDE.EnumDEStrategyType.DE_best_1_bin
570+
optimizers.Add(optDE_b_1_b)
571+
End With
572+
With Nothing
573+
Dim opt = New clsOptDE(func)
574+
opt.DEStrategy = clsOptDE.EnumDEStrategyType.DE_best_2_bin
575+
optimizers.Add(opt)
576+
End With
577+
With Nothing
578+
Dim opt = New clsOptDE(func)
579+
opt.DEStrategy = clsOptDE.EnumDEStrategyType.DE_current_to_Best_1_bin
580+
optimizers.Add(opt)
581+
End With
582+
With Nothing
583+
Dim opt = New clsOptDE(func)
584+
opt.DEStrategy = clsOptDE.EnumDEStrategyType.DE_current_to_Best_2_bin
585+
optimizers.Add(opt)
586+
End With
587+
With Nothing
588+
Dim opt = New clsOptDE(func)
589+
opt.DEStrategy = clsOptDE.EnumDEStrategyType.DE_current_to_rand_1_bin
590+
optimizers.Add(opt)
591+
End With
592+
With Nothing
593+
Dim opt = New clsOptDE(func)
594+
opt.DEStrategy = clsOptDE.EnumDEStrategyType.DE_rand_1_bin
595+
optimizers.Add(opt)
596+
End With
597+
With Nothing
598+
Dim opt = New clsOptDE(func)
599+
opt.DEStrategy = clsOptDE.EnumDEStrategyType.DE_rand_2_bin
600+
optimizers.Add(opt)
601+
End With
602+
With Nothing
603+
Dim opt = New clsOptDEJADE(func)
604+
optimizers.Add(opt)
605+
End With
606+
With Nothing
607+
Dim opt = New clsOptES(func)
608+
optimizers.Add(opt)
609+
End With
610+
With Nothing
611+
Dim opt = New clsOptFA(func)
612+
opt.Iteration = 300
613+
optimizers.Add(opt)
614+
End With
615+
With Nothing
616+
Dim opt = New clsOptHillClimbing(func)
617+
optimizers.Add(opt)
618+
End With
619+
With Nothing
620+
Dim opt = New clsOptNelderMead(func)
621+
optimizers.Add(opt)
622+
End With
623+
With Nothing
624+
Dim opt = New clsOptCS(func)
625+
optimizers.Add(opt)
626+
End With
627+
With Nothing
628+
Dim opt = New clsOptPatternSearch(func)
629+
optimizers.Add(opt)
630+
End With
631+
With Nothing
632+
Dim opt = New clsOptPSO(func)
633+
optimizers.Add(opt)
634+
End With
635+
With Nothing
636+
Dim opt = New clsOptPSOAIW(func)
637+
optimizers.Add(opt)
638+
End With
639+
With Nothing
640+
Dim opt = New clsOptPSOChaoticIW(func)
641+
opt.ChaoticMode = clsOptPSOChaoticIW.EnumChaoticInertiaWeightMode.CDIW
642+
optimizers.Add(opt)
643+
End With
644+
With Nothing
645+
Dim opt = New clsOptPSOChaoticIW(func)
646+
opt.ChaoticMode = clsOptPSOChaoticIW.EnumChaoticInertiaWeightMode.CRIW
647+
optimizers.Add(opt)
648+
End With
649+
With Nothing
650+
Dim opt = New clsOptPSOLDIW(func)
651+
optimizers.Add(opt)
652+
End With
653+
With Nothing
654+
Dim opt = New clsOptRealGABLX(func)
655+
optimizers.Add(opt)
656+
End With
657+
With Nothing
658+
Dim opt = New clsOptRealGAPCX(func)
659+
opt.Iteration = 1000
660+
optimizers.Add(opt)
661+
End With
662+
With Nothing
663+
Dim opt = New clsOptRealGAREX(func)
664+
optimizers.Add(opt)
665+
End With
666+
With Nothing
667+
Dim opt = New clsOptRealGASPX(func)
668+
optimizers.Add(opt)
669+
End With
670+
With Nothing
671+
Dim opt = New clsOptRealGAUNDX(func)
672+
opt.ALPHA = 0.6
673+
opt.PopulationSize = 100
674+
opt.ChildrenSize = 50
675+
opt.Iteration = 700
676+
optimizers.Add(opt)
677+
End With
678+
With Nothing
679+
Dim opt = New clsOptSimulatedAnnealing(func)
680+
opt.NeighborRange = 0.1
681+
opt.Iteration *= 2
682+
optimizers.Add(opt)
683+
End With
684+
685+
'--------------------------------------------------------------
686+
'微分が必要
687+
'--------------------------------------------------------------
688+
With Nothing
689+
If TryCast(func, BenchmarkFunction.clsBenchSphere) IsNot Nothing Then
690+
optimizers.Add(New clsOptNewtonMethod(func))
691+
End If
692+
End With
693+
With Nothing
694+
If TryCast(func, BenchmarkFunction.clsBenchSphere) IsNot Nothing Then
695+
optimizers.Add(New clsOptSteepestDescent(func))
696+
End If
697+
End With
698+
699+
Return optimizers
700+
End Function
555701
End Class
556702
End Namespace

‎LibOptimizationDotNet3.0/LibOptimizationDotNet3.0.vbproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@
151151
<Compile Include="..\LibOptimization\EasyLinearAlgebra\clsException.vb">
152152
<Link>EasyLinearAlgebra\clsException.vb</Link>
153153
</Compile>
154-
<Compile Include="..\LibOptimization\Optimization\clsFireFly.vb">
155-
<Link>Optimization\clsFireFly.vb</Link>
154+
<Compile Include="..\LibOptimization\Optimization\parts\clsFireFly.vb">
155+
<Link>Optimization\parts\clsFireFly.vb</Link>
156156
</Compile>
157157
<Compile Include="..\LibOptimization\Optimization\clsOptCS.vb">
158158
<Link>Optimization\clsOptCS.vb</Link>
@@ -217,14 +217,14 @@
217217
<Compile Include="..\LibOptimization\Optimization\clsOptSteepestDescent.vb">
218218
<Link>Optimization\clsOptSteepestDescent.vb</Link>
219219
</Compile>
220-
<Compile Include="..\LibOptimization\Optimization\clsOptTemplate.vb">
221-
<Link>Optimization\clsOptTemplate.vb</Link>
220+
<Compile Include="..\LibOptimization\Optimization\parts\clsOptTemplate.vb">
221+
<Link>Optimization\parts\clsOptTemplate.vb</Link>
222222
</Compile>
223-
<Compile Include="..\LibOptimization\Optimization\clsParticle.vb">
224-
<Link>Optimization\clsParticle.vb</Link>
223+
<Compile Include="..\LibOptimization\Optimization\parts\clsParticle.vb">
224+
<Link>Optimization\parts\clsParticle.vb</Link>
225225
</Compile>
226-
<Compile Include="..\LibOptimization\Optimization\clsPoint.vb">
227-
<Link>Optimization\clsPoint.vb</Link>
226+
<Compile Include="..\LibOptimization\Optimization\parts\clsPoint.vb">
227+
<Link>Optimization\parts\clsPoint.vb</Link>
228228
</Compile>
229229
<Compile Include="..\LibOptimization\Util\clsError.vb">
230230
<Link>Util\clsError.vb</Link>

‎LibOptimizationDotNet3.0/My Project/AssemblyInfo.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' 既定値にすることができます:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("1.12.0.0")>
35-
<Assembly: AssemblyFileVersion("1.12.0.0")>
34+
<Assembly: AssemblyVersion("1.13.0.0")>
35+
<Assembly: AssemblyFileVersion("1.13.0.0")>

‎LibOptimizationDotNet3.5/LibOptimizationDotNet3.5.vbproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@
159159
<Compile Include="..\LibOptimization\EasyLinearAlgebra\clsException.vb">
160160
<Link>EasyLinearAlgebra\clsException.vb</Link>
161161
</Compile>
162-
<Compile Include="..\LibOptimization\Optimization\clsFireFly.vb">
163-
<Link>Optimization\clsFireFly.vb</Link>
162+
<Compile Include="..\LibOptimization\Optimization\parts\clsFireFly.vb">
163+
<Link>Optimization\parts\clsFireFly.vb</Link>
164164
</Compile>
165165
<Compile Include="..\LibOptimization\Optimization\clsOptCS.vb">
166166
<Link>Optimization\clsOptCS.vb</Link>
@@ -225,14 +225,14 @@
225225
<Compile Include="..\LibOptimization\Optimization\clsOptSteepestDescent.vb">
226226
<Link>Optimization\clsOptSteepestDescent.vb</Link>
227227
</Compile>
228-
<Compile Include="..\LibOptimization\Optimization\clsOptTemplate.vb">
229-
<Link>Optimization\clsOptTemplate.vb</Link>
228+
<Compile Include="..\LibOptimization\Optimization\parts\clsOptTemplate.vb">
229+
<Link>Optimization\parts\clsOptTemplate.vb</Link>
230230
</Compile>
231-
<Compile Include="..\LibOptimization\Optimization\clsParticle.vb">
232-
<Link>Optimization\clsParticle.vb</Link>
231+
<Compile Include="..\LibOptimization\Optimization\parts\clsParticle.vb">
232+
<Link>Optimization\parts\clsParticle.vb</Link>
233233
</Compile>
234-
<Compile Include="..\LibOptimization\Optimization\clsPoint.vb">
235-
<Link>Optimization\clsPoint.vb</Link>
234+
<Compile Include="..\LibOptimization\Optimization\parts\clsPoint.vb">
235+
<Link>Optimization\parts\clsPoint.vb</Link>
236236
</Compile>
237237
<Compile Include="..\LibOptimization\Util\clsError.vb">
238238
<Link>Util\clsError.vb</Link>

0 commit comments

Comments
 (0)