Changeset 12746 for stable/HeuristicLab.Problems.Programmable/3.3/Templates

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/Templates/CompiledMultiObjectiveProblemDefinition.cs (modified) (3 diffs)
• HeuristicLab.Problems.Programmable/3.3/Templates/CompiledSingleObjectiveProblemDefinition.cs (modified) (3 diffs)

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