Changeset 1287 for trunk/sources/HeuristicLab.GP.StructureIdentification/FunctionLibraryInjector.cs

Timestamp:

03/08/09 12:48:18 (15 years ago)

Author:

gkronber

Message:

Merged change sets from CEDMA branch to trunk:

• r957:r990 r992 r1003 r1041:1044 (#419)
• r1051:1053 r1060 (#419, #224)
• r1072:1075 r1104:1106 r1108:1109 r1115:1116 r1129:1130 r1151 r1156 (#419)
• r1201:1202 (#224)
• r1208 (#487)
• r1214:1217 r1230:1231 (#419)
• r1235:1236 r1238:1239 r1245 (#224)
• r1246 (#505)
• r1251:1254 r1262:1263 (#224)
• r1265:1266, r1275:1277 (#419)

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification/FunctionLibraryInjector.cs (copied) (copied from branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/FunctionLibraryInjector.cs) (5 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/FunctionLibraryInjector.cs

@@ -36 +36 @@
     private const string FUNCTIONLIBRARY = "FunctionLibrary";
 
-    private StructId.Variable variable;
-    private GPOperatorLibrary operatorLibrary;
-
     public override string Description {
       get { return @"Injects a default function library for regression and classification problems."; }
@@ -51 +48 @@
 
     public override IOperation Apply(IScope scope) {
+      StructId.Variable variable;
+      GPOperatorLibrary operatorLibrary;
+
       ItemList<IntData> allowedFeatures = GetVariableValue<ItemList<IntData>>(ALLOWEDFEATURES, scope, true);
       int targetVariable = GetVariableValue<IntData>(TARGETVARIABLE, scope, true).Data;
@@ -56 +56 @@
       // remove the target-variable in case it occures in allowed features
       List<IntData> ts = allowedFeatures.FindAll(d => d.Data == targetVariable);
-      foreach(IntData t in ts) allowedFeatures.Remove(t);
-
-      InitDefaultOperatorLibrary();
-
-      int[] allowedIndexes = new int[allowedFeatures.Count];
-      for(int i = 0; i < allowedIndexes.Length; i++) {
-        allowedIndexes[i] = allowedFeatures[i].Data;
-      }
-
-      variable.SetConstraints(allowedIndexes, 0, 0);
-
-      scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName(FUNCTIONLIBRARY), operatorLibrary));
-      return null;
-    }
-
-    private void InitDefaultOperatorLibrary() {
+      foreach (IntData t in ts) allowedFeatures.Remove(t);
+
       variable = new StructId.Variable();
       StructId.Constant constant = new StructId.Constant();
@@ -173 +159 @@
       operatorLibrary.GPOperatorGroup.AddOperator(tangens);
       operatorLibrary.GPOperatorGroup.AddOperator(xor);
+
+      int[] allowedIndexes = new int[allowedFeatures.Count];
+      for (int i = 0; i < allowedIndexes.Length; i++) {
+        allowedIndexes[i] = allowedFeatures[i].Data;
+      }
+
+      variable.SetConstraints(allowedIndexes, 0, 0);
+
+      scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName(FUNCTIONLIBRARY), operatorLibrary));
+      return null;
     }
 
     private void SetAllowedSubOperators(IFunction f, IFunction[] gs) {
-      foreach(IConstraint c in f.Constraints) {
-        if(c is SubOperatorTypeConstraint) {
+      foreach (IConstraint c in f.Constraints) {
+        if (c is SubOperatorTypeConstraint) {
           SubOperatorTypeConstraint typeConstraint = c as SubOperatorTypeConstraint;
           typeConstraint.Clear();
-          foreach(IFunction g in gs) {
+          foreach (IFunction g in gs) {
             typeConstraint.AddOperator(g);
           }
-        } else if(c is AllSubOperatorsTypeConstraint) {
+        } else if (c is AllSubOperatorsTypeConstraint) {
           AllSubOperatorsTypeConstraint typeConstraint = c as AllSubOperatorsTypeConstraint;
           typeConstraint.Clear();
-          foreach(IFunction g in gs) {
+          foreach (IFunction g in gs) {
             typeConstraint.AddOperator(g);
           }
@@ -194 +190 @@
 
     private void SetAllowedSubOperators(IFunction f, int p, IFunction[] gs) {
-      foreach(IConstraint c in f.Constraints) {
-        if(c is SubOperatorTypeConstraint) {
+      foreach (IConstraint c in f.Constraints) {
+        if (c is SubOperatorTypeConstraint) {
           SubOperatorTypeConstraint typeConstraint = c as SubOperatorTypeConstraint;
-          if(typeConstraint.SubOperatorIndex.Data == p) {
+          if (typeConstraint.SubOperatorIndex.Data == p) {
             typeConstraint.Clear();
-            foreach(IFunction g in gs) {
+            foreach (IFunction g in gs) {
               typeConstraint.AddOperator(g);
             }