Changeset 1265 for branches

Timestamp:

03/05/09 20:05:32 (16 years ago)

Author:

gkronber

Message:

Made 'Autoregression' a parameter of the problem (moved creation of variable 'Autoregression' to ProblemInjector). #224 (Simple frontend for GP for non-expert users (similar to HeurisicLab.SGA))

Location:

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.TimeSeries

Files:

• OffspringSelectionGP.cs (modified) (3 diffs)
• ProblemInjector.cs (modified) (1 diff)
• StandardGP.cs (modified) (3 diffs)

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.TimeSeries/OffspringSelectionGP.cs

@@ -35 +35 @@
   public class OffspringSelectionGP : HeuristicLab.GP.StructureIdentification.OffspringSelectionGP {
     public virtual bool Autoregressive {
-      get { return GetVariableInjector().GetVariable("Autoregressive").GetValue<BoolData>().Data; }
-      set { GetVariableInjector().GetVariable("Autoregressive").GetValue<BoolData>().Data = value; }
+      get { return ProblemInjector.GetVariable("Autoregressive").GetValue<BoolData>().Data; }
+      set { ProblemInjector.GetVariable("Autoregressive").GetValue<BoolData>().Data = value; }
     }
 
@@ -45 +45 @@
     protected override IOperator CreateProblemInjector() {
       return new ProblemInjector();
-    }
-
-    protected override IOperator CreateGlobalInjector() {
-      VariableInjector injector = (VariableInjector)base.CreateGlobalInjector();
-      injector.AddVariable(new HeuristicLab.Core.Variable("Autoregressive", new BoolData()));
-      return injector;
     }
 
@@ -66 +60 @@
       return new OffspringSelectionGpEditor(this);
     }
-
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      OffspringSelectionGP clone = (OffspringSelectionGP)base.Clone(clonedObjects);
-      clone.Autoregressive = Autoregressive;
-      return clone;
-    }
   }
 }

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.TimeSeries/ProblemInjector.cs

@@ -40 +40 @@
     public ProblemInjector()
       : base() {
+      AddVariableInfo(new Core.VariableInfo("Autoregressive", "Autoregressive modelling includes previous values of the target variable to predict future values.", typeof(BoolData), Core.VariableKind.New));
+      GetVariableInfo("Autoregressive").Local = true;
+      AddVariable(new Core.Variable("Autoregressive", new BoolData()));
+
       AddVariableInfo(new Core.VariableInfo("MaxTimeOffset", "MaxTimeOffset", typeof(IntData), Core.VariableKind.New));
       GetVariableInfo("MaxTimeOffset").Local = true;

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.TimeSeries/StandardGP.cs

@@ -35 +35 @@
   public class StandardGP : HeuristicLab.GP.StructureIdentification.StandardGP {
     public bool Autoregressive {
-      get { return GetVariableInjector().GetVariable("Autoregressive").GetValue<BoolData>().Data; }
-      set { GetVariableInjector().GetVariable("Autoregressive").GetValue<BoolData>().Data = value; }
+      get { return ProblemInjector.GetVariable("Autoregressive").GetValue<BoolData>().Data; }
+      set { ProblemInjector.GetVariable("Autoregressive").GetValue<BoolData>().Data = value; }
     }
 
@@ -45 +45 @@
     protected override IOperator CreateProblemInjector() {
       return new ProblemInjector();
-    }
-
-    protected override IOperator CreateGlobalInjector() {
-      VariableInjector injector = (VariableInjector)base.CreateGlobalInjector();
-      injector.AddVariable(new HeuristicLab.Core.Variable("Autoregressive", new BoolData()));
-      return injector;
     }
 
@@ -137 +131 @@
       }
     }
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      OffspringSelectionGP clone = (OffspringSelectionGP)base.Clone(clonedObjects);
-      clone.Autoregressive = Autoregressive;
-      return clone;
-    }
   }
 }