Changeset 7842 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.QuadraticAssignment

Timestamp:

05/16/12 16:28:49 (13 years ago)

Author:

gkronber

Message:

merged r7609:7840 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.QuadraticAssignment (modified) (1 prop)
• HeuristicLab.Problems.QuadraticAssignment/3.3/HeuristicLab.Problems.QuadraticAssignment-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs (modified) (5 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.QuadraticAssignment/3.3/HeuristicLab.Problems.QuadraticAssignment-3.3.csproj

@@ -200 +200 @@
       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
       <Name>HeuristicLab.Problems.Instances-3.3</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -253 +254 @@
 
     private void InitializeOperators() {
-      Operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>());
+      var defaultOperators = new HashSet<IPermutationOperator>(new IPermutationOperator[] {
+        new PartiallyMatchedCrossover(),
+        new Swap2Manipulator(),
+        new ExhaustiveSwap2MoveGenerator()
+      });
+      Operators.AddRange(defaultOperators);
+      Operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>().Except(defaultOperators, new TypeEqualityComparer<IPermutationOperator>()));
       Operators.RemoveAll(x => x is ISingleObjectiveMoveEvaluator);
       Operators.AddRange(ApplicationManager.Manager.GetInstances<IQAPMoveEvaluator>());
@@ -315 +322 @@
       }
       if (Operators.OfType<IMoveGenerator>().Any()) {
-        string inversionMove = Operators.OfType<IMoveGenerator>().OfType<IPermutationInversionMoveOperator>().First().InversionMoveParameter.ActualName;
-        foreach (IPermutationInversionMoveOperator op in Operators.OfType<IPermutationInversionMoveOperator>())
-          op.InversionMoveParameter.ActualName = inversionMove;
-        string translocationMove = Operators.OfType<IMoveGenerator>().OfType<IPermutationTranslocationMoveOperator>().First().TranslocationMoveParameter.ActualName;
-        foreach (IPermutationTranslocationMoveOperator op in Operators.OfType<IPermutationTranslocationMoveOperator>())
-          op.TranslocationMoveParameter.ActualName = translocationMove;
-        string swapMove = Operators.OfType<IMoveGenerator>().OfType<IPermutationSwap2MoveOperator>().First().Swap2MoveParameter.ActualName;
-        foreach (IPermutationSwap2MoveOperator op in Operators.OfType<IPermutationSwap2MoveOperator>()) {
-          op.Swap2MoveParameter.ActualName = swapMove;
+        if (Operators.OfType<IMoveGenerator>().OfType<IPermutationInversionMoveOperator>().Any()) {
+          string inversionMove = Operators.OfType<IMoveGenerator>().OfType<IPermutationInversionMoveOperator>().First().InversionMoveParameter.ActualName;
+          foreach (IPermutationInversionMoveOperator op in Operators.OfType<IPermutationInversionMoveOperator>())
+            op.InversionMoveParameter.ActualName = inversionMove;
+        }
+        if (Operators.OfType<IMoveGenerator>().OfType<IPermutationTranslocationMoveOperator>().Any()) {
+          string translocationMove = Operators.OfType<IMoveGenerator>().OfType<IPermutationTranslocationMoveOperator>().First().TranslocationMoveParameter.ActualName;
+          foreach (IPermutationTranslocationMoveOperator op in Operators.OfType<IPermutationTranslocationMoveOperator>())
+            op.TranslocationMoveParameter.ActualName = translocationMove;
+        }
+        if (Operators.OfType<IMoveGenerator>().OfType<IPermutationSwap2MoveOperator>().Any()) {
+          string swapMove = Operators.OfType<IMoveGenerator>().OfType<IPermutationSwap2MoveOperator>().First().Swap2MoveParameter.ActualName;
+          foreach (IPermutationSwap2MoveOperator op in Operators.OfType<IPermutationSwap2MoveOperator>()) {
+            op.Swap2MoveParameter.ActualName = swapMove;
+          }
         }
       }
@@ -355 +368 @@
       var weights = new DoubleMatrix(data.Weights);
       var distances = new DoubleMatrix(data.Distances);
+      Name = data.Name;
+      Description = data.Description;
       Load(weights, distances);
       EvaluateAndLoadAssignment(data.BestKnownAssignment);
@@ -367 +382 @@
         weights[i, (i + 1) % data.Dimension] = 1;
       var distances = new DoubleMatrix(data.GetDistanceMatrix());
+      Name = data.Name;
+      Description = data.Description;
       Load(weights, distances);
       EvaluateAndLoadAssignment(data.BestKnownTour);