Changeset 13469 for branches/ProblemRefactoring/HeuristicLab.Tests/HeuristicLab.Encodings.ScheduleEncoding-3.3/TestUtils.cs

Timestamp:

12/15/15 15:16:24 (8 years ago)

Author:

mkommend

Message:

#2521: Refactored problem base classes and adapted scheduling encoding, scheduling problem and unit tests.

File:

• branches/ProblemRefactoring/HeuristicLab.Tests/HeuristicLab.Encodings.ScheduleEncoding-3.3/TestUtils.cs (modified) (4 diffs)

branches/ProblemRefactoring/HeuristicLab.Tests/HeuristicLab.Encodings.ScheduleEncoding-3.3/TestUtils.cs

@@ -24 +24 @@
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix;
-using HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition;
+
 using HeuristicLab.Tests;
 
@@ -31 +30 @@
   public class TestUtils {
     public static JSMEncoding CreateTestJSM1() {
-      JSMEncoding result = new JSMEncoding();
-      ItemList<Permutation> jsm = new ItemList<Permutation>();
+      JSMEncoding result = new JSMEncoding(0);
+      ItemList<Permutation> jsm = result.JobSequenceMatrix;
       for (int i = 0; i < 6; i++)
         jsm.Add(new Permutation(PermutationTypes.Absolute, new int[] { 0, 1, 2, 3, 4, 5 }));
-      result.JobSequenceMatrix = jsm;
       return result;
     }
 
     public static JSMEncoding CreateTestJSM2() {
-      JSMEncoding result = new JSMEncoding();
-      ItemList<Permutation> jsm = new ItemList<Permutation>();
+      JSMEncoding result = new JSMEncoding(0);
+      ItemList<Permutation> jsm = result.JobSequenceMatrix;
       for (int i = 0; i < 6; i++)
         jsm.Add(new Permutation(PermutationTypes.Absolute, new int[] { 5, 4, 3, 2, 1, 0 }));
-      result.JobSequenceMatrix = jsm;
       return result;
     }
@@ -66 +63 @@
     public static ItemList<Job> CreateJobData() {
       Job j1 = new Job(0, 0);
-      j1.Tasks = new ItemList<Task> { 
+      j1.Tasks.AddRange(new[]{  
         new Task (0, 0, j1.Index, 1),
         new Task (1, 1, j1.Index, 2),
         new Task (2, 2, j1.Index, 1)
-      };
+      });
 
       Job j2 = new Job(1, 0);
-      j2.Tasks = new ItemList<Task> { 
+      j2.Tasks.AddRange(new[]{ 
         new Task (3, 2, j2.Index, 2),
         new Task (4, 1, j2.Index, 1),
         new Task (5, 0, j2.Index, 2)
-      };
+      });
 
       Job j3 = new Job(2, 0);
-      j3.Tasks = new ItemList<Task> { 
+      j3.Tasks.AddRange(new[]{ 
         new Task (6, 0, j3.Index, 1),
         new Task (7, 2, j3.Index, 2),
         new Task (8, 1, j3.Index, 1)
-      };
+      });
 
       return new ItemList<Job> { j1, j2, j3 };
@@ -90 +87 @@
 
     public static Schedule CreateTestSchedule1() {
-      Schedule result = DirectScheduleRandomCreator.Apply(3, 3, new PWREncoding(3, 3, new TestRandom(new int[] { 1, 0, 1, 1, 2, 0, 2, 2, 0 }, null)), CreateJobData());
+      Schedule result = DirectScheduleRandomCreator.Apply(new PWREncoding(3, 3, new TestRandom(new int[] { 1, 0, 1, 1, 2, 0, 2, 2, 0 }, null)), CreateJobData());
       return result;
     }
 
     public static Schedule CreateTestSchedule2() {
-      Schedule result = DirectScheduleRandomCreator.Apply(3, 3, new PWREncoding(3, 3, new TestRandom(new int[] { 0, 1, 1, 0, 2, 0, 1, 2, 2 }, null)), CreateJobData());
+      Schedule result = DirectScheduleRandomCreator.Apply(new PWREncoding(3, 3, new TestRandom(new int[] { 0, 1, 1, 0, 2, 0, 1, 2, 2 }, null)), CreateJobData());
       return result;
     }