Changeset 9363 for branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3
- Timestamp:
- 04/16/13 13:13:41 (11 years ago)
- Location:
- branches/OaaS
- Files:
-
- 23 edited
- 5 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/OaaS
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 23 24 packages
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.TestFunctions
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Problems.TestFunctions merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Problems.TestFunctions 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Problems.TestFunctions 6917-7005 /branches/CMAES/HeuristicLab.Problems.TestFunctions 9121-9257 /branches/CloningRefactoring/HeuristicLab.Problems.TestFunctions 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.TestFunctions 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.TestFunctions 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.TestFunctions 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Problems.TestFunctions 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.TestFunctions 5060 /branches/NET40/sources/HeuristicLab.Problems.TestFunctions 5138-5162 /branches/ParallelEngine/HeuristicLab.Problems.TestFunctions 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.TestFunctions 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.TestFunctions 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.TestFunctions 6828 /branches/RuntimeOptimizer/HeuristicLab.Problems.TestFunctions 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TestFunctions 7787-8333 /branches/SlaveShutdown/HeuristicLab.Problems.TestFunctions 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.TestFunctions 5370-5682 /branches/Trunk/HeuristicLab.Problems.TestFunctions 6829-6865 /branches/UnloadJobs/HeuristicLab.Problems.TestFunctions 9168-9215 /branches/VNS/HeuristicLab.Problems.TestFunctions 5594-5752 /branches/histogram/HeuristicLab.Problems.TestFunctions 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/AckleyEvaluator.cs
r7259 r9363 109 109 /// <param name="point">N-dimensional point for which the test function should be evaluated.</param> 110 110 /// <returns>The result value of the Ackley function at the given point.</returns> 111 p rotectedoverride double EvaluateFunction(RealVector point) {111 public override double EvaluateFunction(RealVector point) { 112 112 return Apply(point); 113 113 } -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BealeEvaluator.cs
r7259 r9363 98 98 /// <param name="point">N-dimensional point for which the test function should be evaluated.</param> 99 99 /// <returns>The result value of the Beale function at the given point.</returns> 100 p rotectedoverride double EvaluateFunction(RealVector point) {100 public override double EvaluateFunction(RealVector point) { 101 101 return Apply(point); 102 102 } -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BoothEvaluator.cs
r7259 r9363 94 94 /// <param name="point">N-dimensional point for which the test function should be evaluated.</param> 95 95 /// <returns>The result value of the Booth function at the given point.</returns> 96 p rotectedoverride double EvaluateFunction(RealVector point) {96 public override double EvaluateFunction(RealVector point) { 97 97 return Apply(point); 98 98 } -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/GriewankEvaluator.cs
r7259 r9363 133 133 /// <param name="point">N-dimensional point for which the test function should be evaluated.</param> 134 134 /// <returns>The result value of the Griewank function at the given point.</returns> 135 p rotectedoverride double EvaluateFunction(RealVector point) {135 public override double EvaluateFunction(RealVector point) { 136 136 if (point.Length > 100) 137 137 return Apply(point); -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/LevyEvaluator.cs
r7259 r9363 111 111 /// <param name="point">N-dimensional point for which the test function should be evaluated.</param> 112 112 /// <returns>The result value of the Levy function at the given point.</returns> 113 p rotectedoverride double EvaluateFunction(RealVector point) {113 public override double EvaluateFunction(RealVector point) { 114 114 return Apply(point); 115 115 } -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MatyasEvaluator.cs
r7259 r9363 93 93 /// <param name="point">N-dimensional point for which the test function should be evaluated.</param> 94 94 /// <returns>The result value of the Matyas function at the given point.</returns> 95 p rotectedoverride double EvaluateFunction(RealVector point) {95 public override double EvaluateFunction(RealVector point) { 96 96 return Apply(point); 97 97 } -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MultinormalEvaluator.cs
r7259 r9363 44 44 set { Parameters["s^2s"].ActualValue = value; } 45 45 } 46 private static Random Random = newRandom();46 private static System.Random Random = new System.Random(); 47 47 48 48 private Dictionary<int, List<RealVector>> stdCenters; … … 161 161 } 162 162 163 public double Evaluate(RealVector point) { 164 return EvaluateFunction(point); 165 } 166 167 protected override double EvaluateFunction(RealVector point) { 163 public override double EvaluateFunction(RealVector point) { 168 164 double value = 0; 169 165 if (centers.Count == 0) { -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RastriginEvaluator.cs
r7259 r9363 119 119 /// <param name="point">N-dimensional point for which the test function should be evaluated.</param> 120 120 /// <returns>The result value of the Rastrigin function at the given point.</returns> 121 p rotectedoverride double EvaluateFunction(RealVector point) {121 public override double EvaluateFunction(RealVector point) { 122 122 return Apply(point, A.Value); 123 123 } -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RosenbrockEvaluator.cs
r7259 r9363 105 105 /// <param name="point">N-dimensional point for which the test function should be evaluated.</param> 106 106 /// <returns>The result value of the Rosenbrock function at the given point.</returns> 107 p rotectedoverride double EvaluateFunction(RealVector point) {107 public override double EvaluateFunction(RealVector point) { 108 108 return Apply(point); 109 109 } -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SchwefelEvaluator.cs
r7259 r9363 96 96 /// <param name="point">N-dimensional point for which the test function should be evaluated.</param> 97 97 /// <returns>The result value of the Schwefel function at the given point.</returns> 98 p rotectedoverride double EvaluateFunction(RealVector point) {98 public override double EvaluateFunction(RealVector point) { 99 99 return Apply(point); 100 100 } -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs
r7259 r9363 92 92 return EvaluateFunction(new RealVector(new double[] { x, y })); 93 93 } 94 /// <summary>95 /// Gets the best known solution for this function.96 /// </summary>97 public abstract RealVector GetBestKnownSolution(int dimension);98 94 99 95 /// <summary> … … 102 98 /// <param name="point">N-dimensional point for which the test function should be evaluated.</param> 103 99 /// <returns>The result value of the function at the given point.</returns> 104 protected abstract double EvaluateFunction(RealVector point); 100 public abstract double EvaluateFunction(RealVector point); 101 102 /// <summary> 103 /// Gets the best known solution for this function. 104 /// </summary> 105 public abstract RealVector GetBestKnownSolution(int dimension); 105 106 } 106 107 } -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SphereEvaluator.cs
r7259 r9363 132 132 /// <param name="point">N-dimensional point for which the test function should be evaluated.</param> 133 133 /// <returns>The result value of the Sphere function at the given point.</returns> 134 p rotectedoverride double EvaluateFunction(RealVector point) {134 public override double EvaluateFunction(RealVector point) { 135 135 return Apply(point, C.Value, Alpha.Value); 136 136 } -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SumSquaresEvaluator.cs
r7259 r9363 96 96 /// <param name="point">N-dimensional point for which the test function should be evaluated.</param> 97 97 /// <returns>The result value of the Sum Squares function at the given point.</returns> 98 p rotectedoverride double EvaluateFunction(RealVector point) {98 public override double EvaluateFunction(RealVector point) { 99 99 return Apply(point); 100 100 } -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/ZakharovEvaluator.cs
r7259 r9363 100 100 /// <param name="point">N-dimensional point for which the test function should be evaluated.</param> 101 101 /// <returns>The result value of the Zakharov function at the given point.</returns> 102 p rotectedoverride double EvaluateFunction(RealVector point) {102 public override double EvaluateFunction(RealVector point) { 103 103 return Apply(point); 104 104 } -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj
r6866 r9363 108 108 </ItemGroup> 109 109 <ItemGroup> 110 <Compile Include="Evaluators\RandomEvaluator.cs" /> 111 <Compile Include="Improvers\SingleObjectiveTestFunctionImprovementOperator.cs" /> 112 <Compile Include="MoveEvaluators\RandomAdditiveMoveEvaluator.cs" /> 113 <Compile Include="PathRelinkers\SingleObjectiveTestFunctionPathRelinker.cs" /> 110 114 <Compile Include="Plugin.cs" /> 111 115 <Compile Include="Properties\AssemblyInfo.cs" /> … … 152 156 <Compile Include="MoveEvaluators\RealVectorAdditiveMoveWrapper.cs" /> 153 157 <Compile Include="RealVectorToRealVectorEncoder.cs" /> 158 <Compile Include="SimilarityCalculators\SingleObjectiveTestFunctionSimilarityCalculator.cs" /> 154 159 <Compile Include="SingleObjectiveTestFunctionSolution.cs" /> 155 160 <Compile Include="SingleObjectiveTestFunctionProblem.cs" /> … … 159 164 </ItemGroup> 160 165 <ItemGroup> 166 <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj"> 167 <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project> 168 <Name>HeuristicLab.Analysis-3.3</Name> 169 </ProjectReference> 161 170 <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj"> 162 171 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project> … … 193 202 <Name>HeuristicLab.Operators-3.3</Name> 194 203 <Private>False</Private> 204 </ProjectReference> 205 <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj"> 206 <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project> 207 <Name>HeuristicLab.Optimization.Operators-3.3</Name> 195 208 </ProjectReference> 196 209 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj"> … … 232 245 </BootstrapperPackage> 233 246 </ItemGroup> 247 <ItemGroup /> 234 248 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 235 249 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. … … 241 255 --> 242 256 <PropertyGroup> 243 <PreBuildEvent >set Path=%25Path%25;$(ProjectDir);$(SolutionDir)257 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 244 258 set ProjectDir=$(ProjectDir) 245 259 set SolutionDir=$(SolutionDir) … … 248 262 call PreBuildEvent.cmd 249 263 </PreBuildEvent> 264 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 265 export ProjectDir=$(ProjectDir) 266 export SolutionDir=$(SolutionDir) 267 268 $SolutionDir/PreBuildEvent.sh 269 </PreBuildEvent> 250 270 </PropertyGroup> 251 271 </Project> -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Interfaces/ISingleObjectiveTestFunctionProblemEvaluator.cs
r7259 r9363 39 39 40 40 double Evaluate2D(double x, double y); 41 double EvaluateFunction(RealVector point); 41 42 RealVector GetBestKnownSolution(int dimension); 42 43 } -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/MultinormalAdditiveMoveEvaluator.cs
r7259 r9363 55 55 var eval = EvaluatorParameter.ActualValue as MultinormalEvaluator; 56 56 if (eval != null) 57 return eval.Evaluate (wrapper);57 return eval.EvaluateFunction(wrapper); 58 58 throw new InvalidOperationException("evaluator is not a multinormal evaluator"); 59 59 } -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/RealVectorAdditiveMoveWrapper.cs
r7259 r9363 66 66 return vector.Length; 67 67 } 68 protected set { 68 #region Mono Compatibility 69 // this setter should be protected, but the Mono compiler couldn't handle it 70 set { 69 71 throw new System.NotSupportedException("Error: Setting the lenght of the wrapper is not allowed."); 70 72 } 73 #endregion 71 74 } 72 75 } -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Plugin.cs.frame
r7259 r9363 26 26 /// Plugin class for HeuristicLab.Problems.TestFunctions plugin 27 27 /// </summary> 28 [Plugin("HeuristicLab.Problems.TestFunctions", "3.3. 6.$WCREV$")]28 [Plugin("HeuristicLab.Problems.TestFunctions", "3.3.7.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Problems.TestFunctions-3.3.dll", PluginFileType.Assembly)] 30 [PluginDependency("HeuristicLab.Analysis", "3.3")] 30 31 [PluginDependency("HeuristicLab.Collections", "3.3")] 31 32 [PluginDependency("HeuristicLab.Common", "3.3")] … … 36 37 [PluginDependency("HeuristicLab.Operators", "3.3")] 37 38 [PluginDependency("HeuristicLab.Optimization", "3.3")] 39 [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")] 38 40 [PluginDependency("HeuristicLab.Parameters", "3.3")] 39 41 [PluginDependency("HeuristicLab.Persistence", "3.3")] -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Properties/AssemblyInfo.cs.frame
r7259 r9363 53 53 // by using the '*' as shown below: 54 54 [assembly: AssemblyVersion("3.3.0.0")] 55 [assembly: AssemblyFileVersion("3.3. 6.$WCREV$")]55 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")] -
branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs
r7442 r9363 20 20 #endregion 21 21 22 using System; 23 using System.Collections.Generic; 24 using System.Linq; 22 using HeuristicLab.Analysis; 25 23 using HeuristicLab.Common; 26 24 using HeuristicLab.Core; … … 31 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 30 using HeuristicLab.PluginInfrastructure; 31 using System; 32 using System.Collections.Generic; 33 using System.Linq; 33 34 34 35 namespace HeuristicLab.Problems.TestFunctions { … … 69 70 private BestSingleObjectiveTestFunctionSolutionAnalyzer BestSingleObjectiveTestFunctionSolutionAnalyzer { 70 71 get { return Operators.OfType<BestSingleObjectiveTestFunctionSolutionAnalyzer>().FirstOrDefault(); } 72 } 73 private SingleObjectivePopulationDiversityAnalyzer SingleObjectivePopulationDiversityAnalyzer { 74 get { return Operators.OfType<SingleObjectivePopulationDiversityAnalyzer>().FirstOrDefault(); } 71 75 } 72 76 #endregion … … 123 127 } 124 128 125 private bool IsNotFieldReferenced(IOperator x) {126 return !(x == strategyVectorCreator127 || x == strategyVectorCrossover128 || x == strategyVectorManipulator);129 }130 131 129 #region Events 132 130 protected override void OnSolutionCreatorChanged() { … … 139 137 protected override void OnEvaluatorChanged() { 140 138 base.OnEvaluatorChanged(); 141 ParameterizeEvaluator(); 139 bool problemSizeChange = ProblemSize.Value < Evaluator.MinimumProblemSize 140 || ProblemSize.Value > Evaluator.MaximumProblemSize; 141 if (problemSizeChange) { 142 ProblemSize.Value = Math.Max(Evaluator.MinimumProblemSize, Math.Min(ProblemSize.Value, Evaluator.MaximumProblemSize)); 143 } else { 144 ParameterizeEvaluator(); 145 } 142 146 UpdateMoveEvaluators(); 143 147 ParameterizeAnalyzers(); 144 148 Maximization.Value = Evaluator.Maximization; 145 149 BoundsParameter.Value = Evaluator.Bounds; 146 if (ProblemSize.Value < Evaluator.MinimumProblemSize)147 ProblemSize.Value = Evaluator.MinimumProblemSize;148 else if (ProblemSize.Value > Evaluator.MaximumProblemSize)149 ProblemSize.Value = Evaluator.MaximumProblemSize;150 150 BestKnownQuality = new DoubleValue(Evaluator.BestKnownQuality); 151 151 Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged); … … 247 247 } 248 248 private void ParameterizeAnalyzers() { 249 BestSingleObjectiveTestFunctionSolutionAnalyzer.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 250 BestSingleObjectiveTestFunctionSolutionAnalyzer.ResultsParameter.ActualName = "Results"; 251 BestSingleObjectiveTestFunctionSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName; 252 BestSingleObjectiveTestFunctionSolutionAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name; 253 BestSingleObjectiveTestFunctionSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name; 254 BestSingleObjectiveTestFunctionSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name; 255 BestSingleObjectiveTestFunctionSolutionAnalyzer.EvaluatorParameter.ActualName = EvaluatorParameter.Name; 256 BestSingleObjectiveTestFunctionSolutionAnalyzer.BoundsParameter.ActualName = BoundsParameter.Name; 249 if (BestSingleObjectiveTestFunctionSolutionAnalyzer != null) { 250 BestSingleObjectiveTestFunctionSolutionAnalyzer.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 251 BestSingleObjectiveTestFunctionSolutionAnalyzer.ResultsParameter.ActualName = "Results"; 252 BestSingleObjectiveTestFunctionSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName; 253 BestSingleObjectiveTestFunctionSolutionAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name; 254 BestSingleObjectiveTestFunctionSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name; 255 BestSingleObjectiveTestFunctionSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name; 256 BestSingleObjectiveTestFunctionSolutionAnalyzer.EvaluatorParameter.ActualName = EvaluatorParameter.Name; 257 BestSingleObjectiveTestFunctionSolutionAnalyzer.BoundsParameter.ActualName = BoundsParameter.Name; 258 } 259 260 if (SingleObjectivePopulationDiversityAnalyzer != null) { 261 SingleObjectivePopulationDiversityAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name; 262 SingleObjectivePopulationDiversityAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName; 263 SingleObjectivePopulationDiversityAnalyzer.ResultsParameter.ActualName = "Results"; 264 SingleObjectivePopulationDiversityAnalyzer.SimilarityCalculator = Operators.OfType<SingleObjectiveTestFunctionSimilarityCalculator>().SingleOrDefault(); 265 } 257 266 } 258 267 private void InitializeOperators() { 268 Operators.Add(new SingleObjectiveTestFunctionImprovementOperator()); 269 Operators.Add(new SingleObjectiveTestFunctionPathRelinker()); 270 Operators.Add(new SingleObjectiveTestFunctionSimilarityCalculator()); 271 259 272 Operators.Add(new BestSingleObjectiveTestFunctionSolutionAnalyzer()); 273 Operators.Add(new SingleObjectivePopulationDiversityAnalyzer()); 260 274 ParameterizeAnalyzers(); 261 275 Operators.AddRange(ApplicationManager.Manager.GetInstances<IRealVectorOperator>().Cast<IOperator>()); … … 308 322 Evaluator.PointParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 309 323 Evaluator.PointParameter.Hidden = true; 310 BestKnownSolutionParameter.Value = Evaluator.GetBestKnownSolution(ProblemSize.Value); 324 try { 325 BestKnownSolutionParameter.Value = Evaluator.GetBestKnownSolution(ProblemSize.Value); 326 } 327 catch (ArgumentException e) { 328 ErrorHandling.ShowErrorDialog(e); 329 ProblemSize.Value = Evaluator.MinimumProblemSize; 330 } 311 331 } 312 332 private void ParameterizeOperators() { 313 foreach ( IRealVectorCrossover op in Operators.OfType<IRealVectorCrossover>()) {333 foreach (var op in Operators.OfType<IRealVectorCrossover>()) { 314 334 op.ParentsParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 315 335 op.ParentsParameter.Hidden = true; … … 319 339 op.BoundsParameter.Hidden = true; 320 340 } 321 foreach ( IRealVectorManipulator op in Operators.OfType<IRealVectorManipulator>()) {341 foreach (var op in Operators.OfType<IRealVectorManipulator>()) { 322 342 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 323 343 op.RealVectorParameter.Hidden = true; … … 325 345 op.BoundsParameter.Hidden = true; 326 346 } 327 foreach ( IRealVectorMoveOperator op in Operators.OfType<IRealVectorMoveOperator>()) {328 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 329 op.RealVectorParameter.Hidden = true; 330 } 331 foreach ( IRealVectorMoveGenerator op in Operators.OfType<IRealVectorMoveGenerator>()) {347 foreach (var op in Operators.OfType<IRealVectorMoveOperator>()) { 348 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 349 op.RealVectorParameter.Hidden = true; 350 } 351 foreach (var op in Operators.OfType<IRealVectorMoveGenerator>()) { 332 352 op.BoundsParameter.ActualName = BoundsParameter.Name; 333 353 op.BoundsParameter.Hidden = true; 334 354 } 335 foreach ( ISingleObjectiveTestFunctionAdditiveMoveEvaluator op in Operators.OfType<ISingleObjectiveTestFunctionAdditiveMoveEvaluator>()) {355 foreach (var op in Operators.OfType<ISingleObjectiveTestFunctionAdditiveMoveEvaluator>()) { 336 356 op.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName; 337 357 op.QualityParameter.Hidden = true; … … 339 359 op.RealVectorParameter.Hidden = true; 340 360 } 341 foreach ( IRealVectorParticleCreator op in Operators.OfType<IRealVectorParticleCreator>()) {361 foreach (var op in Operators.OfType<IRealVectorParticleCreator>()) { 342 362 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 343 363 op.RealVectorParameter.Hidden = true; … … 347 367 op.ProblemSizeParameter.Hidden = true; 348 368 } 349 foreach ( IRealVectorParticleUpdater op in Operators.OfType<IRealVectorParticleUpdater>()) {369 foreach (var op in Operators.OfType<IRealVectorParticleUpdater>()) { 350 370 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 351 371 op.RealVectorParameter.Hidden = true; … … 353 373 op.BoundsParameter.Hidden = true; 354 374 } 355 foreach ( IRealVectorSwarmUpdater op in Operators.OfType<IRealVectorSwarmUpdater>()) {375 foreach (var op in Operators.OfType<IRealVectorSwarmUpdater>()) { 356 376 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 357 377 op.RealVectorParameter.Hidden = true; … … 363 383 op.RealVectorParameter.Hidden = true; 364 384 } 385 foreach (var op in Operators.OfType<ISingleObjectiveImprovementOperator>()) { 386 op.SolutionParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 387 op.SolutionParameter.Hidden = true; 388 } 389 foreach (var op in Operators.OfType<ISingleObjectivePathRelinker>()) { 390 op.ParentsParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 391 op.ParentsParameter.Hidden = true; 392 } 393 foreach (var op in Operators.OfType<SingleObjectiveTestFunctionSimilarityCalculator>()) { 394 op.SolutionVariableName = SolutionCreator.RealVectorParameter.ActualName; 395 op.QualityVariableName = Evaluator.QualityParameter.ActualName; 396 op.Bounds = Bounds; 397 } 365 398 } 366 399 private void UpdateStrategyVectorBounds() { 367 DoubleMatrixstrategyBounds = (DoubleMatrix)Bounds.Clone();400 var strategyBounds = (DoubleMatrix)Bounds.Clone(); 368 401 for (int i = 0; i < strategyBounds.Rows; i++) { 369 402 if (strategyBounds[i, 0] < 0) strategyBounds[i, 0] = 0;
Note: See TracChangeset
for help on using the changeset viewer.