Changeset 6760 for branches/PersistenceSpeedUp/HeuristicLab.Algorithms.VariableNeighborhoodSearch

Timestamp:

09/14/11 13:59:25 (13 years ago)

Author:

epitzer

Message:

#1530 integrate changes from trunk

Location:

branches/PersistenceSpeedUp

Files:

• . (modified) (2 props)
• HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/HeuristicLabAlgorithmsVariableNeighborhoodSearchPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/Properties/AssemblyInfo.frame (modified) (1 diff)
• HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs (modified) (2 diffs)

branches/PersistenceSpeedUp

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

branches/PersistenceSpeedUp/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/HeuristicLabAlgorithmsVariableNeighborhoodSearchPlugin.cs.frame

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Algorithms.VariableNeighborhoodSearch plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Algorithms.VariableNeighborhoodSearch", "3.3.4.$WCREV$")]
+  [Plugin("HeuristicLab.Algorithms.VariableNeighborhoodSearch", "3.3.5.$WCREV$")]
   [PluginFile("HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]  

branches/PersistenceSpeedUp/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/Properties/AssemblyInfo.frame

@@ -53 +53 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.4.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]

branches/PersistenceSpeedUp/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs

@@ -58 +58 @@
       get { return (FixedValueParameter<BoolValue>)Parameters["SetSeedRandomly"]; }
     }
-    private ConstrainedValueParameter<ILocalImprovementOperator> LocalImprovementParameter {
+    public ConstrainedValueParameter<ILocalImprovementOperator> LocalImprovementParameter {
       get { return (ConstrainedValueParameter<ILocalImprovementOperator>)Parameters["LocalImprovement"]; }
     }
-    private ConstrainedValueParameter<IMultiNeighborhoodShakingOperator> ShakingOperatorParameter {
+    public ConstrainedValueParameter<IMultiNeighborhoodShakingOperator> ShakingOperatorParameter {
       get { return (ConstrainedValueParameter<IMultiNeighborhoodShakingOperator>)Parameters["ShakingOperator"]; }
     }
@@ -88 +88 @@
     private VariableNeighborhoodSearchMainLoop MainLoop {
       get { return FindMainLoop(SolutionsCreator.Successor); }
+    }
+    public int Seed {
+      get { return SeedParameter.Value.Value; }
+      set { SeedParameter.Value.Value = value; }
+    }
+    public bool SetSeedRandomly {
+      get { return SetSeedRandomlyParameter.Value.Value; }
+      set { SetSeedRandomlyParameter.Value.Value = value; }
+    }
+    public ILocalImprovementOperator LocalImprovement {
+      get { return LocalImprovementParameter.Value; }
+      set { LocalImprovementParameter.Value = value; }
+    }
+    public IMultiNeighborhoodShakingOperator ShakingOperator {
+      get { return ShakingOperatorParameter.Value; }
+      set { ShakingOperatorParameter.Value = value; }
+    }
+    public int MaximumIterations {
+      get { return MaximumIterationsParameter.Value.Value; }
+      set { MaximumIterationsParameter.Value.Value = value; }
+    }
+    public int LocalImprovementMaximumIterations {
+      get { return LocalImprovementMaximumIterationsParameter.Value.Value; }
+      set { LocalImprovementMaximumIterationsParameter.Value.Value = value; }
     }
     #endregion

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates