Changeset 77 for trunk/sources/HeuristicLab.Scheduling.JSSP

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.Scheduling.JSSP

Files:

• CopyVariableFromSubScope.cs (modified) (1 diff)
• IsSchedulable.cs (modified) (1 diff)
• ItemListIndexer.cs (modified) (1 diff)
• JSSPInjector.cs (modified) (1 diff)
• ScheduleInjector.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Scheduling.JSSP/CopyVariableFromSubScope.cs

@@ -46 +46 @@
         IItem var = GetVariableValue<IItem>("Variable", s, false);
         if(var != null) {
-          if(scope.GetVariable(GetVariableInfo("Variable").ActualName) != null) {
-            scope.RemoveVariable(GetVariableInfo("Variable").ActualName);
+          if(scope.GetVariable(scope.TranslateName("Variable")) != null) {
+            scope.RemoveVariable(scope.TranslateName("Variable"));
           }
-          scope.AddVariable(new Variable(GetVariableInfo("Variable").ActualName, var));
+          scope.AddVariable(new Variable(scope.TranslateName("Variable"), var));
           return null;
         }

trunk/sources/HeuristicLab.Scheduling.JSSP/IsSchedulable.cs

@@ -40 +40 @@
     public override IOperation Apply(IScope scope) {
       Operation op = GetVariableValue<Operation>("Operation", scope, true);
-      if(scope.GetVariable(GetVariableInfo("Schedulable").ActualName) != null) {
+      if(scope.GetVariable(scope.TranslateName("Schedulable")) != null) {
         BoolData isSchedulable = GetVariableValue<BoolData>("Schedulable", scope, false);
         isSchedulable.Data = (op.Predecessors.Count == 0);
       } else {
-        scope.AddVariable(new Variable(GetVariableInfo("Schedulable").ActualName, new BoolData((op.Predecessors.Count == 0))));
+        scope.AddVariable(new Variable(scope.TranslateName("Schedulable"), new BoolData((op.Predecessors.Count == 0))));
       }
       return null;

trunk/sources/HeuristicLab.Scheduling.JSSP/ItemListIndexer.cs

@@ -45 +45 @@
       ItemList list = GetVariableValue<ItemList>("List", scope, true);
       int index = GetVariableValue<IntData>("Index", scope, true).Data;
-      if(scope.GetVariable(GetVariableInfo("Object").ActualName) != null) {
-        scope.RemoveVariable(GetVariableInfo("Object").ActualName);
+      if(scope.GetVariable(scope.TranslateName("Object")) != null) {
+        scope.RemoveVariable(scope.TranslateName("Object"));
       }
       if((list != null) && (index < list.Count)) {
-        scope.AddVariable(new Variable(GetVariableInfo("Object").ActualName, (IItem)list[index].Clone()));
+        scope.AddVariable(new Variable(scope.TranslateName("Object"), (IItem)list[index].Clone()));
       }
       return null;

trunk/sources/HeuristicLab.Scheduling.JSSP/JSSPInjector.cs

@@ -66 +66 @@
 
     public override IOperation Apply(IScope scope) {
-      scope.AddVariable(new Variable(GetVariableInfo("Machines").ActualName, machines.Clone() as IntData));
-      scope.AddVariable(new Variable(GetVariableInfo("Jobs").ActualName, jobs.Clone() as IntData));
-      scope.AddVariable(new Variable(GetVariableInfo("Operations").ActualName, (ItemList)operations.Clone()));
+      scope.AddVariable(new Variable(scope.TranslateName("Machines"), machines.Clone() as IntData));
+      scope.AddVariable(new Variable(scope.TranslateName("Jobs"), jobs.Clone() as IntData));
+      scope.AddVariable(new Variable(scope.TranslateName("Operations"), (ItemList)operations.Clone()));
       return base.Apply(scope);
     }

trunk/sources/HeuristicLab.Scheduling.JSSP/ScheduleInjector.cs

@@ -51 +51 @@
       IntData timespan = GetVariableValue<IntData>("Timespan", scope, true);
       schedule = new Schedule(machines.Data, timespan.Data);
-      scope.AddVariable(new Variable(GetVariableInfo("Schedule").ActualName, schedule));
+      scope.AddVariable(new Variable(scope.TranslateName("Schedule"), schedule));
       return null;
     }