Changeset 8332

Timestamp:

07/26/12 11:26:24 (12 years ago)

Author:

jkarder

Message:

#1331:

• adjusted parameter types
• changed access levels

File:

• branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified) (3 diffs)

branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

@@ -58 +58 @@
       get { return (IValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
     }
-    public ConstrainedValueParameter<ICrossover> CrossoverParameter {
-      get { return (ConstrainedValueParameter<ICrossover>)Parameters["Crossover"]; }
+    public IConstrainedValueParameter<ICrossover> CrossoverParameter {
+      get { return (IConstrainedValueParameter<ICrossover>)Parameters["Crossover"]; }
     }
     public IValueParameter<BoolValue> ExecutePathRelinkingParameter {
       get { return (IValueLookupParameter<BoolValue>)Parameters["ExecutePathRelinking"]; }
     }
-    public ConstrainedValueParameter<IImprovementOperator> ImproverParameter {
-      get { return (ConstrainedValueParameter<IImprovementOperator>)Parameters["Improver"]; }
+    public IConstrainedValueParameter<IImprovementOperator> ImproverParameter {
+      get { return (IConstrainedValueParameter<IImprovementOperator>)Parameters["Improver"]; }
     }
     public IValueParameter<IntValue> MaximumIterationsParameter {
@@ -73 +73 @@
       get { return (IValueParameter<IntValue>)Parameters["NumberOfHighQualitySolutions"]; }
     }
-    public ConstrainedValueParameter<IPathRelinker> PathRelinkerParameter {
-      get { return (ConstrainedValueParameter<IPathRelinker>)Parameters["PathRelinker"]; }
+    public IConstrainedValueParameter<IPathRelinker> PathRelinkerParameter {
+      get { return (IConstrainedValueParameter<IPathRelinker>)Parameters["PathRelinker"]; }
     }
     public IValueParameter<IntValue> PopulationSizeParameter {
@@ -88 +88 @@
       get { return (IValueParameter<BoolValue>)Parameters["SetSeedRandomly"]; }
     }
-    public ConstrainedValueParameter<ISolutionSimilarityCalculator> SimilarityCalculatorParameter {
-      get { return (ConstrainedValueParameter<ISolutionSimilarityCalculator>)Parameters["SimilarityCalculator"]; }
+    public IConstrainedValueParameter<ISolutionSimilarityCalculator> SimilarityCalculatorParameter {
+      get { return (IConstrainedValueParameter<ISolutionSimilarityCalculator>)Parameters["SimilarityCalculator"]; }
     }
     #endregion
 
     #region Properties
-    private MultiAnalyzer Analyzer {
+    public MultiAnalyzer Analyzer {
       get { return AnalyzerParameter.Value; }
       set { AnalyzerParameter.Value = value; }
     }
-    private ICrossover Crossover {
+    public ICrossover Crossover {
       get { return CrossoverParameter.Value; }
       set { CrossoverParameter.Value = value; }
     }
-    private BoolValue ExecutePathRelinking {
+    public BoolValue ExecutePathRelinking {
       get { return ExecutePathRelinkingParameter.Value; }
       set { ExecutePathRelinkingParameter.Value = value; }
     }
-    private IImprovementOperator Improver {
+    public IImprovementOperator Improver {
       get { return ImproverParameter.Value; }
       set { ImproverParameter.Value = value; }
     }
-    private IntValue MaximumIterations {
+    public IntValue MaximumIterations {
       get { return MaximumIterationsParameter.Value; }
       set { MaximumIterationsParameter.Value = value; }
     }
-    private IntValue NumberOfHighQualitySolutions {
+    public IntValue NumberOfHighQualitySolutions {
       get { return NumberOfHighQualitySolutionsParameter.Value; }
       set { NumberOfHighQualitySolutionsParameter.Value = value; }
     }
-    private IPathRelinker PathRelinker {
+    public IPathRelinker PathRelinker {
       get { return PathRelinkerParameter.Value; }
       set { PathRelinkerParameter.Value = value; }
     }
-    private IntValue PopulationSize {
+    public IntValue PopulationSize {
       get { return PopulationSizeParameter.Value; }
       set { PopulationSizeParameter.Value = value; }
     }
-    private IntValue ReferenceSetSize {
+    public IntValue ReferenceSetSize {
       get { return ReferenceSetSizeParameter.Value; }
       set { ReferenceSetSizeParameter.Value = value; }
     }
-    private IntValue Seed {
+    public IntValue Seed {
       get { return SeedParameter.Value; }
       set { SeedParameter.Value = value; }
     }
-    private BoolValue SetSeedRandomly {
+    public BoolValue SetSeedRandomly {
       get { return SetSeedRandomlyParameter.Value; }
       set { SetSeedRandomlyParameter.Value = value; }
     }
-    private ISolutionSimilarityCalculator SimilarityCalculator {
+    public ISolutionSimilarityCalculator SimilarityCalculator {
       get { return SimilarityCalculatorParameter.Value; }
       set { SimilarityCalculatorParameter.Value = value; }