Changeset 12746 for stable/HeuristicLab.Problems.Programmable

Timestamp:

07/12/15 11:34:29 (9 years ago)

Author:

ascheibe

Message:

#2426 merged r12724 and r12731 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Programmable/3.3/HeuristicLab.Problems.Programmable-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/Templates/CompiledMultiObjectiveProblemDefinition.cs (modified) (3 diffs)
• HeuristicLab.Problems.Programmable/3.3/Templates/CompiledSingleObjectiveProblemDefinition.cs (modified) (3 diffs)

stable/HeuristicLab.Problems.Programmable/3.3/HeuristicLab.Problems.Programmable-3.3.csproj

@@ -149 +149 @@
       <Name>HeuristicLab.Encodings.IntegerVectorEncoding-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.LinearLinkageEncoding\3.3\HeuristicLab.Encodings.LinearLinkageEncoding-3.3.csproj">
+      <Project>{be698769-975a-429e-828c-72bb2b6182c8}</Project>
+      <Name>HeuristicLab.Encodings.LinearLinkageEncoding-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
       <Project>{dbecb8b0-b166-4133-baf1-ed67c3fd7fca}</Project>
@@ -156 +161 @@
       <Project>{bb6d334a-4bb6-4674-9883-31a6ebb32cab}</Project>
       <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
+      <Project>{06d4a186-9319-48a0-bade-a2058d462eea}</Project>
+      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">

stable/HeuristicLab.Problems.Programmable/3.3/Templates/CompiledMultiObjectiveProblemDefinition.cs

@@ -7 +7 @@
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
+using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Encodings.RealVectorEncoding;
+using HeuristicLab.Encodings.LinearLinkageEncoding;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Problems.Programmable;
@@ -23 +25 @@
       //Encoding = new RealVectorEncoding("r", length: 5, min: -1.0, max: 1.0);
       //Encoding = new PermutationEncoding("p", length: 5, type: PermutationTypes.Absolute);
+      //Encoding = new LinearLinkageEncoding("l", length: 5);
+      //Encoding = new SymbolicExpressionTreeEncoding("s", new SimpleSymbolicExpressionGrammar(), 50, 12);
       // The encoding can also be a combination
       //Encoding = new MultiEncoding()
@@ -29 +33 @@
       //.Add(new RealVectorEncoding("r", length: 5, min: -1.0, max: 1.0))
       //.Add(new PermutationEncoding("p", length: 5, type: PermutationTypes.Absolute))
+      //.Add(new LinearLinkageEncoding("l", length: 5))
+      //.Add(new SymbolicExpressionTreeEncoding("s", new SimpleSymbolicExpressionGrammar(), 50, 12))
       ;
       // Add additional initialization code e.g. private variables that you need for evaluating

stable/HeuristicLab.Problems.Programmable/3.3/Templates/CompiledSingleObjectiveProblemDefinition.cs

@@ -7 +7 @@
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
+using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Encodings.RealVectorEncoding;
+using HeuristicLab.Encodings.LinearLinkageEncoding;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Problems.Programmable;
@@ -23 +25 @@
       //Encoding = new RealVectorEncoding("r", length: 5, min: -1.0, max: 1.0);
       //Encoding = new PermutationEncoding("p", length: 5, type: PermutationTypes.Absolute);
+      //Encoding = new LinearLinkageEncoding("l", length: 5);
+      //Encoding = new SymbolicExpressionTreeEncoding("s", new SimpleSymbolicExpressionGrammar(), 50, 12);
       // The encoding can also be a combination
       //Encoding = new MultiEncoding()
@@ -29 +33 @@
       //.Add(new RealVectorEncoding("r", length: 5, min: -1.0, max: 1.0))
       //.Add(new PermutationEncoding("p", length: 5, type: PermutationTypes.Absolute))
+      //.Add(new LinearLinkageEncoding("l", length: 5))
+      //.Add(new SymbolicExpressionTreeEncoding("s", new SimpleSymbolicExpressionGrammar(), 50, 12))
       ;
       // Add additional initialization code e.g. private variables that you need for evaluating