Changeset 6569 for branches/QAPAlgorithms/HeuristicLab.Algorithms.TabuSearch

Timestamp:

07/17/11 22:51:11 (13 years ago)

Author:

abeham

Message:

#1541

• updated to latest trunk version

Location:

branches/QAPAlgorithms

Files:

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

branches/QAPAlgorithms

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

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

branches/QAPAlgorithms/HeuristicLab.Algorithms.TabuSearch/3.3/HeuristicLabAlgorithmsTabuSearchPlugin.cs.frame

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

branches/QAPAlgorithms/HeuristicLab.Algorithms.TabuSearch/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/QAPAlgorithms/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.cs

@@ -58 +58 @@
       get { return (ValueParameter<BoolValue>)Parameters["SetSeedRandomly"]; }
     }
-    private ConstrainedValueParameter<IMoveGenerator> MoveGeneratorParameter {
+    public ConstrainedValueParameter<IMoveGenerator> MoveGeneratorParameter {
       get { return (ConstrainedValueParameter<IMoveGenerator>)Parameters["MoveGenerator"]; }
     }
-    private ConstrainedValueParameter<IMoveMaker> MoveMakerParameter {
+    public ConstrainedValueParameter<IMoveMaker> MoveMakerParameter {
       get { return (ConstrainedValueParameter<IMoveMaker>)Parameters["MoveMaker"]; }
     }
-    private ConstrainedValueParameter<ISingleObjectiveMoveEvaluator> MoveEvaluatorParameter {
+    public ConstrainedValueParameter<ISingleObjectiveMoveEvaluator> MoveEvaluatorParameter {
       get { return (ConstrainedValueParameter<ISingleObjectiveMoveEvaluator>)Parameters["MoveEvaluator"]; }
     }
-    private ConstrainedValueParameter<ITabuChecker> TabuCheckerParameter {
+    public ConstrainedValueParameter<ITabuChecker> TabuCheckerParameter {
       get { return (ConstrainedValueParameter<ITabuChecker>)Parameters["TabuChecker"]; }
     }
-    private ConstrainedValueParameter<ITabuMaker> TabuMakerParameter {
+    public ConstrainedValueParameter<ITabuMaker> TabuMakerParameter {
       get { return (ConstrainedValueParameter<ITabuMaker>)Parameters["TabuMaker"]; }
     }
@@ -123 +123 @@
       get { return MaximumIterationsParameter.Value; }
       set { MaximumIterationsParameter.Value = value; }
+    }
+    public IntValue SampleSize {
+      get { return SampleSizeParameter.Value; }
+      set { SampleSizeParameter.Value = value; }
     }
     public MultiAnalyzer Analyzer {

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