Changeset 11397

Timestamp:

09/28/14 09:18:30 (10 years ago)

Author:

abeham

Message:

#2174:

• Renamed methods from e.g. Configuration.AddReal to Configuration.AddRealVector
• Introduced the variable store into the single-objective problem definition script
• Created a base class for problem definitions that are derived from in code
• Created a view for problem definition scripts that also includes the variable store
  • It looks like a C# script view, but unfortunately, the content types are not compatible

Location:

branches/ProgrammableProblem

Files:

• HeuristicLab.Problems.Programmable.Views/3.3/HeuristicLab.Problems.Programmable.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.Programmable.Views/3.3/ProblemDefinitionScriptView.Designer.cs (added)
• HeuristicLab.Problems.Programmable.Views/3.3/ProblemDefinitionScriptView.cs (added)
• HeuristicLab.Problems.Programmable/3.3/Datastructures/Configuration.cs (modified) (5 diffs)
• HeuristicLab.Problems.Programmable/3.3/Datastructures/ParameterVector.cs (modified) (3 diffs)
• HeuristicLab.Problems.Programmable/3.3/HeuristicLab.Problems.Programmable-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/Interfaces/IProblemDefinition.cs (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/Operators/ParameterVectorMoveGenerator.cs (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/ProblemDefinition.cs (added)
• HeuristicLab.Problems.Programmable/3.3/ProblemDefinitionScript.cs (modified) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProblemDefinition.cs (modified) (3 diffs)
• HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProblemDefinitionScript.cs (modified) (4 diffs)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable.Views/3.3/HeuristicLab.Problems.Programmable.Views-3.3.csproj

@@ -38 +38 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.CodeEditor-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.CodeEditor-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Common-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
@@ -98 +108 @@
   <ItemGroup>
     <Compile Include="Plugin.cs" />
+    <Compile Include="ProblemDefinitionScriptView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ProblemDefinitionScriptView.Designer.cs">
+      <DependentUpon>ProblemDefinitionScriptView.cs</DependentUpon>
+    </Compile>
     <Compile Include="ProgrammableProblemView.cs">
       <SubType>UserControl</SubType>

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

@@ -54 +54 @@
 
 
-    public Configuration AddBinary(string name, int length) {
+    public Configuration AddBinaryVector(string name, int length) {
       if (Parameters.ContainsKey(name)) throw new ArgumentException("name must be unique", "name");
       Parameters.Add(name, new BinaryParameterConfiguration(length));
@@ -60 +60 @@
     }
 
-    public Configuration AddInteger(string name, int length, int min, int max, int? step = null) {
+    public Configuration AddIntegerVector(string name, int length, int min, int max, int? step = null) {
       if (Parameters.ContainsKey(name)) throw new ArgumentException("name must be unique", "name");
       Parameters.Add(name, new IntegerParameterConfiguration(length, min, max, step));
@@ -66 +66 @@
     }
 
-    public Configuration AddInteger(string name, int length, IList<int> min, IList<int> max, IList<int> step = null) {
+    public Configuration AddIntegerVector(string name, int length, IList<int> min, IList<int> max, IList<int> step = null) {
       if (Parameters.ContainsKey(name)) throw new ArgumentException("name must be unique", "name");
       Parameters.Add(name, new IntegerParameterConfiguration(length, min, max, step));
@@ -72 +72 @@
     }
 
-    public Configuration AddReal(string name, int length, double min, double max) {
+    public Configuration AddRealVector(string name, int length, double min, double max) {
       if (Parameters.ContainsKey(name)) throw new ArgumentException("name must be unique", "name");
       Parameters.Add(name, new RealParameterConfiguration(length, min, max));
@@ -78 +78 @@
     }
 
-    public Configuration AddReal(string name, int length, IList<double> min, IList<double> max) {
+    public Configuration AddRealVector(string name, int length, IList<double> min, IList<double> max) {
       if (Parameters.ContainsKey(name)) throw new ArgumentException("name must be unique", "name");
       Parameters.Add(name, new RealParameterConfiguration(length, min, max));

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Datastructures/ParameterVector.cs

@@ -76 +76 @@
     }
 
-    public BinaryVector Binary(string name) {
+    public BinaryVector BinaryVector(string name) {
       return BinaryParameters[name];
     }
 
-    public bool Binary(string name, int index) {
+    public bool BinaryValue(string name, int index) {
       return BinaryParameters[name][index];
     }
@@ -88 +88 @@
     }
 
-    public IntegerVector Integer(string name) {
+    public IntegerVector IntegerVector(string name) {
       return IntegerParameters[name];
     }
 
-    public int Integer(string name, int index) {
+    public int IntegerValue(string name, int index) {
       return IntegerParameters[name][index];
     }
@@ -100 +100 @@
     }
 
-    public RealVector Real(string name) {
+    public RealVector RealVector(string name) {
       return RealParameters[name];
     }
 
-    public double Real(string name, int index) {
+    public double RealValue(string name, int index) {
       return RealParameters[name][index];
     }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/HeuristicLab.Problems.Programmable-3.3.csproj

@@ -153 +153 @@
     <Compile Include="Interfaces\IProblemDefinition.cs" />
     <Compile Include="Interfaces\ISingleObjectiveProblemDefinition.cs" />
+    <Compile Include="ProblemDefinition.cs" />
     <Compile Include="ProblemDefinitionScript.cs" />
     <Compile Include="SingleObjectiveProblemDefinition.cs" />

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Interfaces/IProblemDefinition.cs

@@ -23 +23 @@
 namespace HeuristicLab.Problems.Programmable {
   public interface IProblemDefinition {
+    dynamic vars { get; set; }
+    void Initialize();
     Configuration GetConfiguration();
   }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/ParameterVectorMoveGenerator.cs

@@ -79 +79 @@
         moveScopes[i] = new Scope(i.ToString());
         foreach (var param in nbhood[i].BinaryNames)
-          moveScopes[i].Variables.Add(new Variable(param, nbhood[i].Binary(param)));
+          moveScopes[i].Variables.Add(new Variable(param, nbhood[i].BinaryVector(param)));
 
         foreach (var param in nbhood[i].IntegerNames)
-          moveScopes[i].Variables.Add(new Variable(param, nbhood[i].Integer(param)));
+          moveScopes[i].Variables.Add(new Variable(param, nbhood[i].IntegerVector(param)));
 
         foreach (var param in nbhood[i].RealNames)
-          moveScopes[i].Variables.Add(new Variable(param, nbhood[i].Real(param)));
+          moveScopes[i].Variables.Add(new Variable(param, nbhood[i].RealVector(param)));
 
         foreach (var param in nbhood[i].PermutationNames)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/ProblemDefinitionScript.cs

@@ -34 +34 @@
     protected bool SuppressEvents { get; set; }
 
+    [Storable]
+    private VariableStore variableStore;
+    public VariableStore VariableStore {
+      get { return variableStore; }
+    }
+
     [StorableConstructor]
     protected ProblemDefinitionScript(bool deserializing) : base(deserializing) { }
     protected ProblemDefinitionScript(ProblemDefinitionScript original, Cloner cloner)
-      : base(original, cloner) { }
-    public ProblemDefinitionScript() { }
+      : base(original, cloner) {
+      variableStore = cloner.Clone(original.variableStore);
+    }
+    protected ProblemDefinitionScript() {
+      variableStore = new VariableStore();
+    }
 
     private volatile IProblemDefinition instance;
@@ -74 +84 @@
       try {
         Instance = (IProblemDefinition)Activator.CreateInstance(types.First(x => typeof(IProblemDefinition).IsAssignableFrom(x)));
+        Instance.vars = new Variables(VariableStore);
+        Instance.Initialize();
       } catch {
         Instance = null;

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProblemDefinition.cs

@@ -30 +30 @@
   [Item("Single-objective Problem Definition", "This definition can be dynamically created through code and assigned to the problem.")]
   public class SingleObjectiveProblemDefinition : ISingleObjectiveProblemDefinitionHost, ISingleObjectiveProblemDefinition {
-
     private bool isMaximizationProblem;
     public bool IsMaximizationProblem {
@@ -114 +113 @@
 
     #region Problem definition explicit interface implementations
+    dynamic IProblemDefinition.vars { get; set; }
+
+    void IProblemDefinition.Initialize() {
+
+    }
+
+    Configuration IProblemDefinition.GetConfiguration() {
+      return Configuration();
+    }
+
     bool ISingleObjectiveProblemDefinition.IsMaximizationProblem {
       get { return IsMaximizationProblem; }
@@ -128 +137 @@
     IEnumerable<ParameterVector> ISingleObjectiveProblemDefinition.GetNeighbors(IRandom random, ParameterVector vector) {
       return Neighbors(random, vector);
-    }
-
-    Configuration IProblemDefinition.GetConfiguration() {
-      return Configuration();
     }
     #endregion

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProblemDefinitionScript.cs

@@ -60 +60 @@
 using HeuristicLab.Problems.Programmable;
 
-public class ProblemDefinition : ISingleObjectiveProblemDefinition {
-  public ProblemDefinition() {
-    // initialize private fields
+public class CustomProblemDefinition : ProblemDefinition, ISingleObjectiveProblemDefinition {
+  public bool IsMaximizationProblem { get { return false; } }
+
+  public override void Initialize() {
+    // when the definition is created here you can initialize variables in the variable store
   }
 
-  public bool IsMaximizationProblem { get { return false; } }
-
-  public Configuration GetConfiguration() {
+  public override Configuration GetConfiguration() {
     return new Configuration()
-      // .AddBinary(""b"", length: 5)
-      // .AddInteger(""i"", length: 5, min: 2, max: 14, step: 4)
-      // .AddReal(""r"", length: 5, min: -1.0, max: 1.0)
+      // .AddBinaryVector(""b"", length: 5)
+      // .AddIntegerVector(""i"", length: 5, min: 2, max: 14, step: 4)
+      // .AddRealVector(""r"", length: 5, min: -1.0, max: 1.0)
       // .AddPermutation(""P"", length: 5, type: PermutationTypes.Absolute)
     ;
@@ -78 +78 @@
   public double Evaluate(IRandom random, ParameterVector vector) {
     var quality = 0.0;
-    // quality = vector.Real(""r"").Sum(x => x * x);
+    // use vars.yourVariable to access variables in the variable store i.e. yourVariable
+    // quality = vector.RealVector(""r"").Sum(x => x * x);
     return quality;
   }
@@ -84 +85 @@
   public void Analyze(ParameterVector[] vectors, double[] qualities, ResultCollection results) {
     // write or update results given the range of vectors and resulting qualities
+    // use e.g. vars.yourVariable to access variables in the variable store i.e. yourVariable
   }
 
@@ -90 +92 @@
     // This method is only called from move-based algorithms (LocalSearch, SimulatedAnnealing, etc.)
     while (true) {
+      // this is not an infinite loop as only a finite amount of samples will be drawn
+      // it is possible to return a concrete amount of neighbors also
       var neighbor = (ParameterVector)vector.Clone();
       //e.g. make a bit flip in a binary parameter
-      //var bIndex = random.Next(neighbor.Binary(""b"").Length);
-      //neighbor.Binary(""b"")[bIndex] = !neighbor.Binary(""b"")[bIndex];
+      //var bIndex = random.Next(neighbor.BinaryVector(""b"").Length);
+      //neighbor.BinaryVector(""b"")[bIndex] = !neighbor.BinaryVector(""b"")[bIndex];
       yield return neighbor;
-      yield break;
     }
   }