Changeset 10856 for branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/Datastructures

Timestamp:

05/15/14 15:06:57 (11 years ago)

Author:

abeham

Message:

#2174: Worked on programmable problem

• Changed ProblemBase to IProblemDefinition and SingleObjectiveProblemBase to ISingleObjectiveProblemDefinition
• Derived ParameterVectorCreater, -Crossover, and -Manipulator from MultiOperator<> instead of InstrumentedOperator
• Split the megamoth ScriptOnInstanceChanged to multiple methods dealing with single-vector and multi-vector encodings separately, it's still a lot of tedious code
• Removed maximization from Configuration again (would not be consistent with multi-objective problems)

Location:

branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/Datastructures

Files:

• BinaryParameterConfiguration.cs (modified) (1 diff)
• Configuration.cs (modified) (3 diffs)
• IntegerParameterConfiguration.cs (modified) (2 diffs)
• PermutationParameterConfiguration.cs (modified) (1 diff)
• RealParameterConfiguration.cs (modified) (2 diffs)

branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/Datastructures/BinaryParameterConfiguration.cs

@@ -46 +46 @@
       length = cloner.Clone(original.length);
     }
-    public BinaryParameterConfiguration(int length)
-      : base() {
+    public BinaryParameterConfiguration(int length) {
       this.length = new IntValue(length);
     }

branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/Datastructures/Configuration.cs

@@ -34 +34 @@
     public Dictionary<string, ParameterConfiguration> Parameters { get; protected set; }
 
-    [Storable]
-    public bool Maximization { get; protected set; }
-
     [StorableConstructor]
     protected Configuration(bool deserializing) : base(deserializing) { }
@@ -47 +44 @@
         }
       }
-      Maximization = original.Maximization;
     }
     public Configuration() {
@@ -88 +84 @@
     }
 
-    public Configuration AddPermutation(string name, PermutationTypes type, int length) {
+    public Configuration AddPermutation(string name, int length, PermutationTypes type) {
       if (Parameters.ContainsKey(name)) throw new ArgumentException("name must be unique", "name");
       Parameters.Add(name, new PermutationParameterConfiguration(length, type));
       return this;
     }
-
-    public Configuration SetMaximization(bool maximization) {
-      Maximization = maximization;
-      return this;
-    }
   }
 }

branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/Datastructures/IntegerParameterConfiguration.cs

@@ -61 +61 @@
       bounds = cloner.Clone(original.bounds);
     }
-    public IntegerParameterConfiguration(int length, int min, int max, int? step = null)
-      : base() {
+    public IntegerParameterConfiguration(int length, int min, int max, int? step = null) {
       if (min >= max) throw new ArgumentException("min must be less than max", "min");
       if (step.HasValue && step.Value <= 0) throw new ArgumentException("step must be greater than zero or null", "step");
@@ -71 +70 @@
       if (step.HasValue) bounds[0, 2] = step.Value;
     }
-    public IntegerParameterConfiguration(int length, IList<int> min, IList<int> max, IList<int> step = null)
-      : base() {
+    public IntegerParameterConfiguration(int length, IList<int> min, IList<int> max, IList<int> step = null) {
       if (min.Count == 0) throw new ArgumentException("Bounds must be given for the integer parameters.");
       if (min.Count != max.Count) throw new ArgumentException("min must be of the same length as max", "min");
       if (step != null && min.Count != step.Count) throw new ArgumentException("step must be of the same length as min or null", "step");
-      if (min.Zip(max, (m, M) => m >= M).Any()) throw new ArgumentException("min must be less than max in each dimension", "min");
+      if (min.Zip(max, (mi, ma) => mi >= ma).Any()) throw new ArgumentException("min must be less than max in each dimension", "min");
       this.length = new IntValue(length);
       bounds = new IntMatrix(min.Count, step != null ? 3 : 2);

branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/Datastructures/PermutationParameterConfiguration.cs

@@ -59 +59 @@
       type = cloner.Clone(original.type);
     }
-    public PermutationParameterConfiguration(int length, PermutationTypes type)
-      : base() {
+    public PermutationParameterConfiguration(int length, PermutationTypes type) {
       this.length = new IntValue(length);
       this.type = new PermutationType(type);

branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/Datastructures/RealParameterConfiguration.cs

@@ -61 +61 @@
       bounds = cloner.Clone(original.bounds);
     }
-    public RealParameterConfiguration(int length, double min, double max)
-      : base() {
+    public RealParameterConfiguration(int length, double min, double max) {
       if (min >= max) throw new ArgumentException("min must be less than max", "min");
       this.length = new IntValue(length);
@@ -69 +68 @@
       bounds[0, 1] = max;
     }
-    public RealParameterConfiguration(int length, IList<double> min, IList<double> max)
-      : base() {
+    public RealParameterConfiguration(int length, IList<double> min, IList<double> max) {
       if (min.Count == 0) throw new ArgumentException("Bounds must be given for the real parameters.");
       if (min.Count != max.Count) throw new ArgumentException("min must be of the same length as max", "min");
-      if (min.Zip(max, (m, M) => m >= M).Any()) throw new ArgumentException("min must be less than max in each dimension", "min");
+      if (min.Zip(max, (mi, ma) => mi >= ma).Any()) throw new ArgumentException("min must be less than max in each dimension", "min");
       this.length = new IntValue(length);
       bounds = new DoubleMatrix(min.Count, 2);