Changeset 3569 for trunk

Timestamp:

04/30/10 10:30:24 (15 years ago)

Author:

gkronber

Message:

Changed multi-operators in symbolic expression tree encoding to populate the list of available operators via the ApplicationManager. #937 (Data types and operators for symbolic expression tree encoding)

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3

Files:

• ArchitectureManipulators/MultiSymbolicExpressionTreeArchitectureManipulator.cs (modified) (3 diffs)
• Manipulators/MultiSymbolicExpressionTreeManipulator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/ArchitectureManipulators/MultiSymbolicExpressionTreeArchitectureManipulator.cs

@@ -30 +30 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Interfaces;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.ArchitectureManipulators {
@@ -88 +89 @@
       Parameters.Add(new LookupParameter<ISymbolicExpressionGrammar>(SymbolicExpressionGrammarParameterName, "The grammar that defines the allowed symbols and syntax of the symbolic expression trees."));
 
-      Operators.Add(new ArgumentCreater());
-      Operators.Add(new ArgumentDeleter());
-      Operators.Add(new ArgumentDuplicater());
-      Operators.Add(new SubroutineCreater());
-      Operators.Add(new SubroutineDeleter());
-      Operators.Add(new SubroutineDuplicater());
+      foreach (var availableOperatorType in ApplicationManager.Manager.GetTypes(typeof(ISymbolicExpressionTreeArchitectureManipulator))) {
+        if (availableOperatorType != this.GetType())
+          Operators.Add((ISymbolicExpressionTreeArchitectureManipulator)Activator.CreateInstance(availableOperatorType), true);
+      }
     }
 
@@ -121 +120 @@
     }
 
-    public override IOperation Apply() {
-      if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one symbolic expression tree architecture manipulator to choose from.");
-      return base.Apply();
-    }
-
     #region ISymbolicExpressionTreeArchitectureManipulator Members
     public void ModifyArchitecture(IRandom random, SymbolicExpressionTree symbolicExpressionTree, ISymbolicExpressionGrammar grammar, IntValue maxTreeSize, IntValue maxTreeHeight, IntValue maxFunctionDefiningBranches, IntValue maxFunctionArguments, out bool success) {

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Manipulators/MultiSymbolicExpressionTreeManipulator.cs

@@ -30 +30 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Interfaces;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Manipulators {
@@ -75 +76 @@
       Parameters.Add(new LookupParameter<ISymbolicExpressionGrammar>(SymbolicExpressionGrammarParameterName, "The grammar that defines the allowed symbols and syntax of the symbolic expression trees."));
 
-      Operators.Add(new FullTreeShaker());
-      Operators.Add(new OnePointShaker());
-      Operators.Add(new ChangeNodeTypeManipulation());
+      foreach (var availableOperatorType in ApplicationManager.Manager.GetTypes(typeof(ISymbolicExpressionTreeArchitectureManipulator))) {
+        if (availableOperatorType != this.GetType())
+          Operators.Add((ISymbolicExpressionTreeArchitectureManipulator)Activator.CreateInstance(availableOperatorType), true);
+      }
     }
 
@@ -102 +104 @@
       }
     }
-
-    public override IOperation Apply() {
-      if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one symbolic expression tree manipulator to choose from.");
-      return base.Apply();
-    }
   }
 }