Changeset 2174 for trunk/sources/HeuristicLab.Modeling/3.2

Timestamp:

07/20/09 20:14:47 (15 years ago)

Author:

gkronber

Message:

Implemented #302 (Show variable names instead of var<index> in GP function trees).

• Added a new operator that chooses a random value from a list of possible values.
• Changed mutation operator for variables and differentials
• Changed internal linear representation of function trees to support different types for local data.

File:

• trunk/sources/HeuristicLab.Modeling/3.2/ProblemInjector.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Modeling/3.2/ProblemInjector.cs

@@ -78 +78 @@
       AddVariableInfo(new VariableInfo("MaxNumberOfTrainingSamples", "Maximal number of training samples to use (optional)", typeof(IntData), VariableKind.In));
       AddVariableInfo(new VariableInfo("NumberOfInputVariables", "The number of available input variables", typeof(IntData), VariableKind.New));
+      AddVariableInfo(new VariableInfo("InputVariables", "List of input variable names", typeof(ItemList), VariableKind.New));
     }
 
@@ -97 +98 @@
 
       Dataset scopeDataset = CreateNewDataset(operatorDataset, targetVariable, operatorAllowedFeatures);
+      ItemList inputVariables = new ItemList();
+      for (int i = 1; i < scopeDataset.Columns; i++) {
+        inputVariables.Add(new StringData(scopeDataset.GetVariableName(i)));
+      }
 
-      scope.AddVariable(new Variable("Dataset", scopeDataset));
-      scope.AddVariable(new Variable("TargetVariable", new IntData(0)));
-      scope.AddVariable(new Variable("NumberOfInputVariables", new IntData(scopeDataset.Columns - 1)));
+      scope.AddVariable(new Variable(scope.TranslateName("Dataset"), scopeDataset));
+      scope.AddVariable(new Variable(scope.TranslateName("TargetVariable"), new IntData(0)));
+      scope.AddVariable(new Variable(scope.TranslateName("NumberOfInputVariables"), new IntData(scopeDataset.Columns - 1)));
+      scope.AddVariable(new Variable(scope.TranslateName("InputVariables"), inputVariables));
 
       int trainingStart = GetVariableValue<IntData>("TrainingSamplesStart", scope, true).Data;
@@ -116 +122 @@
       scope.AddVariable(new Variable(scope.TranslateName("ActualTrainingSamplesStart"), new IntData(trainingStart)));
       scope.AddVariable(new Variable(scope.TranslateName("ActualTrainingSamplesEnd"), new IntData(trainingStart + nTrainingSamples)));
+
+
       return null;
     }
@@ -154 +162 @@
 
     private void AddVariableToScope(string variableName, IScope scope) {
-      scope.AddVariable(new Variable(variableName, (IItem)GetVariable(variableName).Value.Clone()));      
+      scope.AddVariable(new Variable(scope.TranslateName(variableName), (IItem)GetVariable(variableName).Value.Clone()));      
     }
   }