Changeset 11768 for branches

Timestamp:

01/15/15 17:17:41 (10 years ago)

Author:

mkommend

Message:

#2174: Further bug fixing in programmable problem.

Location:

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3

Files:

• HeuristicLab.Problems.Programmable-3.3.csproj (modified) (2 diffs)
• Interfaces/IProblemDefinition.cs (modified) (1 diff)
• New/MultiObjectiveScriptableProblem.cs (modified) (1 diff)
• New/Scripts/CompiledProblemDefinition.cs (modified) (3 diffs)
• OLD_MultiObjectiveProgrammableProblem.cs (deleted)
• OLD_SingleObjectiveProgrammableProblem.cs (deleted)

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

@@ -179 +179 @@
     <Compile Include="New\Scripts\MultiObjectiveProblemDefinitionScript.cs" />
     <Compile Include="New\Scripts\SingleObjectiveProblemDefinitionScript.cs" />
-    <Compile Include="OLD_MultiObjectiveProgrammableProblem.cs" />
-    <Compile Include="OLD_SingleObjectiveProgrammableProblem.cs" />
     <EmbeddedResource Include="New\Scripts\Templates\ScriptTemplates.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -195 +193 @@
       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
       <Name>HeuristicLab.Optimization-3.3</Name>
-      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>

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

@@ -23 +23 @@
 
 namespace HeuristicLab.Problems.Programmable {
-  public interface IProblemDefinition : INamedItem {
+  public interface IProblemDefinition {
     IEncoding Encoding { get; }
   }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/MultiObjectiveScriptableProblem.cs

@@ -63 +63 @@
     public MultiObjectiveScriptableProblem()
       : base() {
-      Parameters.Add(new FixedValueParameter<SingleObjectiveProblemDefinitionScript>("ProblemScript", "Defines the problem.", new SingleObjectiveProblemDefinitionScript() { Name = Name }));
+      Parameters.Add(new FixedValueParameter<MultiObjectiveProblemDefinitionScript>("ProblemScript", "Defines the problem.", new MultiObjectiveProblemDefinitionScript() { Name = Name }));
       RegisterEvents();
     }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/Scripts/CompiledProblemDefinition.cs

@@ -21 +21 @@
 
 using System;
-using HeuristicLab.Common;
-using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.Programmable {
-  public abstract class CompiledProblemDefinition : NamedItem, IProblemDefinition {
-    [Storable(Name = "Encoding")]
+  public abstract class CompiledProblemDefinition : IProblemDefinition {
     private IEncoding encoding;
     public IEncoding Encoding {
@@ -33 +29 @@
       protected set {
         if (value == null) throw new ArgumentNullException("The encoding must not be null.");
-        if (encoding == value) return;
         encoding = value;
       }
@@ -41 +36 @@
     public abstract void Initialize();
 
-    [StorableConstructor]
-    protected CompiledProblemDefinition(bool deserializing) : base(deserializing) { }
-    protected CompiledProblemDefinition(CompiledProblemDefinition original, Cloner cloner)
-      : base(original, cloner) {
-      this.encoding = cloner.Clone(original.encoding);
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      throw new InvalidOperationException("ProblemScript instances cannot be cloned.");
-    }
-
-    public CompiledProblemDefinition() { }
-    protected CompiledProblemDefinition(IEncoding encoding) : this(encoding, "ProblemDefinition") { }
-    protected CompiledProblemDefinition(IEncoding encoding, string name) : this(encoding, name, string.Empty) { }
-    protected CompiledProblemDefinition(IEncoding encoding, string name, string description)
-      : base(name, description) {
+    protected CompiledProblemDefinition() { }
+    protected CompiledProblemDefinition(IEncoding encoding)
+      : base() {
       Encoding = encoding;
     }