Changeset 11813 for branches

Timestamp:

01/21/15 11:54:43 (10 years ago)

Author:

mkommend

Message:

#2174: Updated views and renamed programmable problem to basic problem and added individual extension methods.

Location:

branches/ProgrammableProblem

Files:

• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Problems.Programmable.Views/3.3/HeuristicLab.Problems.Programmable.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/HeuristicLab.Problems.Programmable-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/Individuals/Individual.cs (modified) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/Individuals/MultiEncodingIndividual.cs (modified) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/Individuals/SingleEncodingIndividual.cs (modified) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/New/BasicProblem.cs (moved) (moved from branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/ProgrammableProblem.cs) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/New/MultiObjectiveBasicProblem.cs (moved) (moved from branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/MultiObjectiveProgrammableProblem.cs)
• HeuristicLab.Problems.Programmable/3.3/New/OneMaxNew.cs (modified) (3 diffs)
• HeuristicLab.Problems.Programmable/3.3/New/SingleObjectiveBasicProblem.cs (moved) (moved from branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/SingleObjectiveProgrammableProblem.cs)

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

@@ -40 +40 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HeuristicLab.CodeEditor-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+    <Reference Include="HeuristicLab.CodeEditor-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.CodeEditor-3.3.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.CodeEditor-3.4.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">

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

@@ -148 +148 @@
     <Compile Include="Interfaces\IEncodingOperator.cs" />
     <Compile Include="Interfaces\ISingleObjectiveMoveOperator.cs" />
-    <Compile Include="New\ProgrammableProblem.cs" />
-    <Compile Include="New\MultiObjectiveProgrammableProblem.cs" />
+    <Compile Include="New\BasicProblem.cs" />
+    <Compile Include="New\MultiObjectiveBasicProblem.cs" />
     <Compile Include="New\MultiObjectiveScriptableProblem.cs" />
     <Compile Include="New\Scripts\Templates\CompiledMultiObjectiveProblemDefinition.cs" />
@@ -175 +175 @@
     <Compile Include="New\Scripts\ProblemDefinitionScript.cs" />
     <Compile Include="New\OneMaxNew.cs" />
-    <Compile Include="New\SingleObjectiveProgrammableProblem.cs" />
+    <Compile Include="New\SingleObjectiveBasicProblem.cs" />
     <Compile Include="New\SingleObjectiveScriptableProblem.cs" />
     <Compile Include="New\Scripts\MultiObjectiveProblemDefinitionScript.cs" />

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Individuals/Individual.cs

@@ -40 +40 @@
 
     public abstract IItem this[string name] { get; set; }
+    public abstract TEncoding GetEncoding<TEncoding>() where TEncoding : class, IEncoding;
 
     public Individual Copy() {
@@ -62 +63 @@
   #region extension methods
   public static class IndividualExtensionMethods {
+    public static BinaryVector BinaryVector(this Individual individual) {
+      var encoding = individual.GetEncoding<BinaryEncoding>();
+      return individual.BinaryVector(encoding.Name);
+    }
     public static BinaryVector BinaryVector(this Individual individual, string name) {
       return (BinaryVector)individual[name];
+    }
+
+    public static IntegerVector IntegerVector(this Individual individual) {
+      var encoding = individual.GetEncoding<IntegerEncoding>();
+      return individual.IntegerVector(encoding.Name);
     }
     public static IntegerVector IntegerVector(this Individual individual, string name) {
       return (IntegerVector)individual[name];
     }
+
+    public static Permutation Permutation(this Individual individual) {
+      var encoding = individual.GetEncoding<PermutationEncoding>();
+      return individual.Permutation(encoding.Name);
+    }
     public static Permutation Permutation(this Individual individual, string name) {
       return (Permutation)individual[name];
+    }
+
+    public static RealVector RealVector(this Individual individual) {
+      var encoding = individual.GetEncoding<RealEncoding>();
+      return individual.RealVector(encoding.Name);
     }
     public static RealVector RealVector(this Individual individual, string name) {

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Individuals/MultiEncodingIndividual.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 
@@ -46 +47 @@
     public override IItem this[string name] {
       get {
-        var individual = individuals.FirstOrDefault(i => i.Name == name);
+        var individual = individuals.SingleOrDefault(i => i.Name == name);
         if (individual == null) throw new ArgumentException(string.Format("{0} is not part of the specified encoding.", name));
         return individual[name];
       }
       set {
-        var individual = individuals.FirstOrDefault(i => i.Name == name);
+        var individual = individuals.SingleOrDefault(i => i.Name == name);
         if (individual == null) throw new ArgumentException(string.Format("{0} is not part of the specified encoding.", name));
         individual[name] = value;
       }
+    }
+
+    public override TEncoding GetEncoding<TEncoding>() {
+      TEncoding encoding;
+      try {
+        encoding = (TEncoding)Encoding.Encodings.SingleOrDefault(e => e is TEncoding);
+      }
+      catch (InvalidOperationException) {
+        throw new InvalidOperationException(string.Format("The individual uses multiple {0} .", typeof(TEncoding).GetPrettyName()));
+      }
+      if (encoding == null) throw new InvalidOperationException(string.Format("The individual does not use a {0}.", typeof(TEncoding).GetPrettyName()));
+      return encoding;
     }
 

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Individuals/SingleEncodingIndividual.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 
@@ -42 +43 @@
     }
 
+    public override TEncoding GetEncoding<TEncoding>() {
+      TEncoding encoding = Encoding as TEncoding;
+      if (encoding == null) throw new InvalidOperationException(string.Format("The individual does not use a {0}.", typeof(TEncoding).GetPrettyName()));
+      return encoding;
+    }
+
     internal override Individual Copy(IScope scope) {
       SetScopeValue(Name, scope, (IItem)this[Name].Clone());

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

@@ -103 +103 @@
       Parameters.Add(solutionCreatorParam);
 
-      //TODO register solution creator changed event
+      //TODO register solution creator changed event, change access modifier to private
+      //((IValueParameter)solutionCreatorParam).ValueChanged += SolutionCreatorParameter_ValueChanged;      
 
       OnOperatorsChanged();
@@ -132 +133 @@
 
       var comparer = new TypeEqualityComparer<IOperator>();
+      var cloner = new Cloner();
       var oldOperators = oldEncoding.Operators;
       var newOperators = newEncoding.Operators;
 
-      var operators = oldOperators.Intersect(newOperators, comparer);
-      //TODO clone overlapping operators
+
+      var operators = oldOperators.Intersect(newOperators, comparer).Select(op => cloner.Clone(op));
       operators = operators.Union(newOperators, comparer);
 

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

@@ -21 +21 @@
 
 using System.Linq;
+using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.BinaryVectorEncoding;
+using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -37 +40 @@
       : base() {
       Encoding = new BinaryEncoding("BinaryVector", 10);
+      var bestScopeSolutionAnalyzer = Operators.OfType<BestScopeSolutionAnalyzer>().FirstOrDefault();
+      if (bestScopeSolutionAnalyzer != null) Operators.Remove(bestScopeSolutionAnalyzer);
     }
 
@@ -47 +52 @@
     }
     public override double Evaluate(Individual individual, IRandom random) {
-      return individual.BinaryVector("BinaryVector").Count(b => b);
+      return individual.BinaryVector().Count(b => b);
     }
 
-
+    public override void Analyze(Individual[] individuals, double[] qualities, ResultCollection results) {
+      base.Analyze(individuals, qualities, results);
+      var best = individuals.Zip(qualities, (i, q) => new { Individual = i, Quality = q }).OrderByDescending(z => z.Quality).First();
+      if (!results.ContainsKey("Best Solution")) {
+        results.Add(new Result("Best Solution", typeof(BinaryVector)));
+      }
+      results["Best Solution"].Value = best.Individual.BinaryVector();
+    }
   }
 }