Changeset 7116

Timestamp:

12/04/11 15:53:02 (13 years ago)

Author:

gkronber

Message:

#1329: added a solution file, added missing overrides for GetHashCode(), removed tautological if-conditions, adapted prebuildevent script and added the build script

Location:

branches/Scheduling

Files:

• . (modified) (1 prop)
• Build.cmd (added)
• HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/HeuristicLab.Encodings.ScheduleEncoding.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/HeuristicLab.Encodings.ScheduleEncoding-3.3.csproj (modified) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/JSMEncoding.cs (modified) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/PWREncoding.cs (modified) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Job.cs (modified) (2 diffs)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Resource.cs (modified) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Schedule.cs (modified) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/ScheduledTask.cs (modified) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Task.cs (modified) (1 diff)
• HeuristicLab.Problems.Scheduling.Views/3.3/HeuristicLab.Problems.Scheduling.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.Scheduling/3.3/HeuristicLab.Problems.Scheduling-3.3.csproj (modified) (1 diff)
• HeuristicLab.Scheduling.sln (added)
• PreBuildEvent.cmd (modified) (1 diff)

branches/Scheduling

@@ -12 +12 @@
 *.psess
 *.vsp
+_ReSharper.HeuristicLab.Scheduling
+*.user

@@ -12 +12 @@
 *.psess
 *.vsp
+_ReSharper.HeuristicLab.Scheduling
+*.user

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/HeuristicLab.Encodings.ScheduleEncoding.Views-3.3.csproj

@@ -126 +126 @@
 
 call PreBuildEvent.cmd
-SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Plugin.cs.frame" "%25ProjectDir%25\Plugin.cs"</PreBuildEvent>
+</PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/HeuristicLab.Encodings.ScheduleEncoding-3.3.csproj

@@ -146 +146 @@
 set Outdir=$(Outdir)
 
-call PreBuildEvent.cmd
-SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Plugin.cs.frame" "%25ProjectDir%25\Plugin.cs"</PreBuildEvent>
+call PreBuildEvent.cmd</PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/JSMEncoding.cs

@@ -66 +66 @@
       return false;
     }
-
+    public override int GetHashCode() {
+      if (JobSequenceMatrix.Count == 1)
+        return JobSequenceMatrix[0].GetHashCode();
+      if (JobSequenceMatrix.Count == 2)
+        return JobSequenceMatrix[0].GetHashCode() ^ JobSequenceMatrix[1].GetHashCode();
+      return 0;
+    }
     private static bool AreEqual(JSMEncoding jSMEncoding1, JSMEncoding jSMEncoding2) {
       if (jSMEncoding1.JobSequenceMatrix.Count != jSMEncoding2.JobSequenceMatrix.Count)

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/PWREncoding.cs

@@ -81 +81 @@
         return base.Equals(obj);
     }
-
+    public override int GetHashCode() {
+      if (PermutationWithRepetition.Length == 1)
+        return PermutationWithRepetition[0].GetHashCode();
+      if (PermutationWithRepetition.Length == 2)
+        return PermutationWithRepetition[0].GetHashCode() ^ PermutationWithRepetition[1].GetHashCode();
+      return 0;
+    }
     private bool AreEqual(PWREncoding pWREncoding1, PWREncoding pWREncoding2) {
       if (pWREncoding1.PermutationWithRepetition.Length != pWREncoding2.PermutationWithRepetition.Length)

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Job.cs

@@ -52 +52 @@
       Tasks = new ItemList<Task>();
 
-      if (dueDate != null)
-        DueDate = dueDate;
+      DueDate = dueDate;
 
     }
@@ -63 +62 @@
         sb.Append(t.ToString() + " ");
       }
-      if (DueDate != null)
-        sb.Append("{" + DueDate + "} ");
+      sb.Append("{" + DueDate + "} ");
       sb.Append("]");
       return sb.ToString();

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Resource.cs

@@ -83 +83 @@
         return false;
     }
-
+    public override int GetHashCode() {
+      if (Tasks.Count == 1)
+        return Tasks[0].GetHashCode();
+      if (Tasks.Count == 2)
+        return Tasks[0].GetHashCode() ^ Tasks[1].GetHashCode();
+      return 0;
+    }
     private static bool AreEqual(Resource res1, Resource res2) {
       if (res1.Tasks.Count != res2.Tasks.Count)

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Schedule.cs

@@ -171 +171 @@
         return false;
     }
+    public override int GetHashCode() {
+      if (Resources.Count == 1)
+        return Resources[0].GetHashCode();
+      if (Resources.Count == 2)
+        return Resources[0].GetHashCode() ^ Resources[1].GetHashCode();
+      return 0;
+    }
 
     private static bool AreEqual(Schedule schedule1, Schedule schedule2) {

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/ScheduledTask.cs

@@ -83 +83 @@
     }
 
+    public override int GetHashCode() {
+      return TaskNr ^ JobNr;
+    }
+
     public static bool AreEqual(ScheduledTask task1, ScheduledTask task2) {
       return (

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Task.cs

@@ -76 +76 @@
         return false;
     }
-
+    public override int GetHashCode() {
+      return TaskNr ^ JobNr;
+    }
     public static bool AreEqual(Task task1, Task task2) {
       return (task1.Duration == task2.Duration &&

branches/Scheduling/HeuristicLab.Problems.Scheduling.Views/3.3/HeuristicLab.Problems.Scheduling.Views-3.3.csproj

@@ -129 +129 @@
 set Outdir=$(Outdir)
 
-call PreBuildEvent.cmd
-SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Plugin.cs.frame" "%25ProjectDir%25\Plugin.cs"</PreBuildEvent>
+call PreBuildEvent.cmd</PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/HeuristicLab.Problems.Scheduling-3.3.csproj

@@ -120 +120 @@
 set Outdir=$(Outdir)
 
-call PreBuildEvent.cmd
-SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Plugin.cs.frame" "%25ProjectDir%25\Plugin.cs"</PreBuildEvent>
+call PreBuildEvent.cmd</PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/Scheduling/PreBuildEvent.cmd

@@ -1 +1 @@
 SubWCRev "%ProjectDir%\" "%ProjectDir%\Properties\AssemblyInfo.frame" "%ProjectDir%\Properties\AssemblyInfo.cs"
+SubWCRev "%ProjectDir%\" "%ProjectDir%\Plugin.cs.frame" "%ProjectDir%\Plugin.cs"

@@ -12 +12 @@
 *.psess
 *.vsp
+_ReSharper.HeuristicLab.Scheduling
+*.user