Changeset 77 for trunk/sources/HeuristicLab.Routing.TSP

Timestamp:

03/18/08 16:00:00 (16 years ago)

Author:

swagner

Message:

Fixed ticket #67

• adapted accessing of variables in operators due to changes of variable lookup and the new name aliasing mechanism (actual/formal name translations should not be done directly anymore; instead the new method Scope.TranslateName should be used)

Location:

trunk/sources/HeuristicLab.Routing.TSP

Files:

• TSPDistanceMatrixInjectorBase.cs (modified) (1 diff)
• TSPInjector.cs (modified) (1 diff)
• TSPTourInjector.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Routing.TSP/TSPDistanceMatrixInjectorBase.cs

@@ -49 +49 @@
         }
       }
-      scope.AddVariable(new Variable(GetVariableInfo("DistanceMatrix").ActualName, new DoubleMatrixData(distanceMatrix)));
+      scope.AddVariable(new Variable(scope.TranslateName("DistanceMatrix"), new DoubleMatrixData(distanceMatrix)));
 
       return null;

trunk/sources/HeuristicLab.Routing.TSP/TSPInjector.cs

@@ -51 +51 @@
 
     public override IOperation Apply(IScope scope) {
-      scope.AddVariable(new Variable(GetVariableInfo("Maximization").ActualName, new BoolData(false)));
-      scope.AddVariable(new Variable(GetVariableInfo("Cities").ActualName, (IItem)GetVariable("Cities").Value.Clone()));
-      scope.AddVariable(new Variable(GetVariableInfo("Coordinates").ActualName, (IItem)GetVariable("Coordinates").Value.Clone()));
+      scope.AddVariable(new Variable(scope.TranslateName("Maximization"), new BoolData(false)));
+      scope.AddVariable(new Variable(scope.TranslateName("Cities"), (IItem)GetVariable("Cities").Value.Clone()));
+      scope.AddVariable(new Variable(scope.TranslateName("Coordinates"), (IItem)GetVariable("Coordinates").Value.Clone()));
       if (GetVariable("InjectBestKnownQuality").GetValue<BoolData>().Data)
-        scope.AddVariable(new Variable(GetVariableInfo("BestKnownQuality").ActualName, (IItem)GetVariable("BestKnownQuality").Value.Clone()));
+        scope.AddVariable(new Variable(scope.TranslateName("BestKnownQuality"), (IItem)GetVariable("BestKnownQuality").Value.Clone()));
       return null;
     }

trunk/sources/HeuristicLab.Routing.TSP/TSPTourInjector.cs

@@ -50 +50 @@
           AddVariable(new Variable(info.ActualName, tour));
         else
-          scope.AddVariable(new Variable(info.ActualName, tour));
+          scope.AddVariable(new Variable(scope.TranslateName(info.FormalName), tour));
       } else {
         tour.Coordinates = coordinates;