Changeset 3199

Timestamp:

03/23/10 02:43:59 (14 years ago)

Author:

swagner

Message:

Fixed and updated GeneticAlgorithmPerformanceTest (#945).

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/Tests/GeneticAlgorithm.hl (modified) (previous)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/Tests/HeuristicLab.Algorithms.GeneticAlgorithm-3.3.Tests.csproj (modified) (1 diff)
• HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs

@@ -286 +286 @@
     private void InitializeSelectors() {
       selectors = new List<ISelector>();
-      if (ApplicationManager.Manager != null) {
-        selectors.AddRange(ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name));
-        ParameterizeSelectors();
-      }
+      if (ApplicationManager.Manager != null) selectors.AddRange(ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name));
+      ParameterizeSelectors();
     }
     private void ParameterizeSelectors() {
@@ -317 +315 @@
     }
     private void UpdateCrossovers() {
-      ICrossover oldCrossover = CrossoverParameter.Value;
-      CrossoverParameter.ValidValues.Clear();
-      foreach (ICrossover crossover in Problem.Operators.OfType<ICrossover>().OrderBy(x => x.Name))
-        CrossoverParameter.ValidValues.Add(crossover);
-      if (oldCrossover != null) {
-        ICrossover crossover = CrossoverParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldCrossover.GetType());
-        if (crossover != null) CrossoverParameter.Value = crossover;
+      if (ApplicationManager.Manager != null) {
+        ICrossover oldCrossover = CrossoverParameter.Value;
+        CrossoverParameter.ValidValues.Clear();
+        foreach (ICrossover crossover in Problem.Operators.OfType<ICrossover>().OrderBy(x => x.Name))
+          CrossoverParameter.ValidValues.Add(crossover);
+        if (oldCrossover != null) {
+          ICrossover crossover = CrossoverParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldCrossover.GetType());
+          if (crossover != null) CrossoverParameter.Value = crossover;
+        }
       }
     }
     private void UpdateMutators() {
-      IManipulator oldMutator = MutatorParameter.Value;
-      MutatorParameter.ValidValues.Clear();
-      foreach (IManipulator mutator in Problem.Operators.OfType<IManipulator>().OrderBy(x => x.Name))
-        MutatorParameter.ValidValues.Add(mutator);
-      if (oldMutator != null) {
-        IManipulator mutator = MutatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMutator.GetType());
-        if (mutator != null) MutatorParameter.Value = mutator;
+      if (ApplicationManager.Manager != null) {
+        IManipulator oldMutator = MutatorParameter.Value;
+        MutatorParameter.ValidValues.Clear();
+        foreach (IManipulator mutator in Problem.Operators.OfType<IManipulator>().OrderBy(x => x.Name))
+          MutatorParameter.ValidValues.Add(mutator);
+        if (oldMutator != null) {
+          IManipulator mutator = MutatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMutator.GetType());
+          if (mutator != null) MutatorParameter.Value = mutator;
+        }
       }
     }

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/Tests/HeuristicLab.Algorithms.GeneticAlgorithm-3.3.Tests.csproj

@@ -156 +156 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="GeneticAlgorithm.hl" />
+    <None Include="GeneticAlgorithm.hl">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

@@ -294 +294 @@
     private void InitializeOperators() {
       operators = new List<IPermutationOperator>();
-      if (ApplicationManager.Manager != null) {
-        operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>());
-        ParameterizeOperators();
-      }
+      if (ApplicationManager.Manager != null) operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>());
+      ParameterizeOperators();
       InitializeMoveGenerators();
     }