Changeset 1856 for trunk/sources/HeuristicLab.Modeling

Timestamp:

05/20/09 10:09:59 (16 years ago)

Author:

gkronber

Message:

Moved problem injectors from GP.StructureIdentification projects into HeuristicLab.Modeling and made some necessary adjustments (project name, references, plugin dependencies). #635

Location:

trunk/sources/HeuristicLab.Modeling/3.2

Files:

• . (modified) (1 prop)
• ClassificationProblemInjector.cs (moved) (moved from trunk/sources/HeuristicLab.GP.StructureIdentification.Classification/3.3/ProblemInjector.cs) (1 diff)
• HeuristicLab.Modeling-3.2.csproj (added)
• HeuristicLab.snk (added)
• ProblemInjector.cs (moved) (moved from trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/ProblemInjector.cs) (1 diff)
• ProblemInjectorView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/ProblemInjectorView.Designer.cs) (1 diff)
• ProblemInjectorView.cs (moved) (moved from trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/ProblemInjectorView.cs) (1 diff)
• ProblemInjectorView.resx (moved) (moved from trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/ProblemInjectorView.resx)
• TimeSeriesProblemInjector.cs (moved) (moved from trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/ProblemInjector.cs) (1 diff)

trunk/sources/HeuristicLab.Modeling/3.2

@@ -1 +1 @@
 bin
 obj
+*.user

@@ -1 +1 @@
 bin
 obj
+*.user

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

@@ -24 +24 @@
 using System.Text;
 using System.Xml;
-using Core = HeuristicLab.Core;
+using HeuristicLab.Core;
 using HeuristicLab.Data;
 
-namespace HeuristicLab.GP.StructureIdentification.Classification {
-  public class ProblemInjector : HeuristicLab.GP.StructureIdentification.ProblemInjector {
+namespace HeuristicLab.Modeling {
+  public class ClassificationProblemInjector : ProblemInjector {
 
     public override string Description {
       get {
-        return "Problem injector for classification structure identification.";
+        return "Problem injector for classification problems.";
       }
     }
 
-    public ProblemInjector()
+    public ClassificationProblemInjector()
       : base() {
       AddVariableInfo(new Core.VariableInfo("TargetClassValues", "TargetClassValues", typeof(ItemList<DoubleData>), Core.VariableKind.New));

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

@@ -24 +24 @@
 using System.Text;
 using System.Xml;
-using Core = HeuristicLab.Core;
+using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Operators;
 using HeuristicLab.DataAnalysis;
 
-namespace HeuristicLab.GP.StructureIdentification {
-  public class ProblemInjector : Core.OperatorBase {
+namespace HeuristicLab.Modeling {
+  public class ProblemInjector : OperatorBase {
     public override string Description {
-      get { return @"Injects the necessary variables for a structure identification problem."; }
+      get { return @"Injects the necessary variables for a data-based modeling problem."; }
     }
 
     public ProblemInjector()
       : base() {
-      AddVariableInfo(new Core.VariableInfo("Dataset", "Dataset", typeof(Dataset), Core.VariableKind.New));
+      AddVariableInfo(new VariableInfo("Dataset", "Dataset", typeof(Dataset), VariableKind.New));
       GetVariableInfo("Dataset").Local = true;
-      AddVariable(new Core.Variable("Dataset", new Dataset()));
+      AddVariable(new Variable("Dataset", new Dataset()));
 
-      AddVariableInfo(new Core.VariableInfo("TargetVariable", "TargetVariable", typeof(IntData), Core.VariableKind.New));
+      AddVariableInfo(new VariableInfo("TargetVariable", "TargetVariable", typeof(IntData), VariableKind.New));
       GetVariableInfo("TargetVariable").Local = true;
-      AddVariable(new Core.Variable("TargetVariable", new IntData()));
+      AddVariable(new Variable("TargetVariable", new IntData()));
 
-      AddVariableInfo(new Core.VariableInfo("AllowedFeatures", "Indexes of allowed input variables", typeof(ItemList<IntData>), Core.VariableKind.New));
+      AddVariableInfo(new VariableInfo("AllowedFeatures", "Indexes of allowed input variables", typeof(ItemList<IntData>), VariableKind.New));
       GetVariableInfo("AllowedFeatures").Local = true;
-      AddVariable(new Core.Variable("AllowedFeatures", new ItemList<IntData>()));
+      AddVariable(new Variable("AllowedFeatures", new ItemList<IntData>()));
 
-      AddVariableInfo(new Core.VariableInfo("TrainingSamplesStart", "TrainingSamplesStart", typeof(IntData), Core.VariableKind.New));
+      AddVariableInfo(new VariableInfo("TrainingSamplesStart", "TrainingSamplesStart", typeof(IntData), VariableKind.New));
       GetVariableInfo("TrainingSamplesStart").Local = true;
-      AddVariable(new Core.Variable("TrainingSamplesStart", new IntData()));
+      AddVariable(new Variable("TrainingSamplesStart", new IntData()));
 
-      AddVariableInfo(new Core.VariableInfo("TrainingSamplesEnd", "TrainingSamplesEnd", typeof(IntData), Core.VariableKind.New));
+      AddVariableInfo(new VariableInfo("TrainingSamplesEnd", "TrainingSamplesEnd", typeof(IntData), VariableKind.New));
       GetVariableInfo("TrainingSamplesEnd").Local = true;
-      AddVariable(new Core.Variable("TrainingSamplesEnd", new IntData()));
+      AddVariable(new Variable("TrainingSamplesEnd", new IntData()));
 
-      AddVariableInfo(new Core.VariableInfo("ValidationSamplesStart", "ValidationSamplesStart", typeof(IntData), Core.VariableKind.New));
+      AddVariableInfo(new VariableInfo("ValidationSamplesStart", "ValidationSamplesStart", typeof(IntData), VariableKind.New));
       GetVariableInfo("ValidationSamplesStart").Local = true;
-      AddVariable(new Core.Variable("ValidationSamplesStart", new IntData()));
+      AddVariable(new Variable("ValidationSamplesStart", new IntData()));
 
-      AddVariableInfo(new Core.VariableInfo("ValidationSamplesEnd", "ValidationSamplesEnd", typeof(IntData), Core.VariableKind.New));
+      AddVariableInfo(new VariableInfo("ValidationSamplesEnd", "ValidationSamplesEnd", typeof(IntData), VariableKind.New));
       GetVariableInfo("ValidationSamplesEnd").Local = true;
-      AddVariable(new Core.Variable("ValidationSamplesEnd", new IntData()));
+      AddVariable(new Variable("ValidationSamplesEnd", new IntData()));
 
-      AddVariableInfo(new Core.VariableInfo("TestSamplesStart", "TestSamplesStart", typeof(IntData), Core.VariableKind.New));
+      AddVariableInfo(new VariableInfo("TestSamplesStart", "TestSamplesStart", typeof(IntData), VariableKind.New));
       GetVariableInfo("TestSamplesStart").Local = true;
-      AddVariable(new Core.Variable("TestSamplesStart", new IntData()));
+      AddVariable(new Variable("TestSamplesStart", new IntData()));
 
-      AddVariableInfo(new Core.VariableInfo("TestSamplesEnd", "TestSamplesEnd", typeof(IntData), Core.VariableKind.New));
+      AddVariableInfo(new VariableInfo("TestSamplesEnd", "TestSamplesEnd", typeof(IntData), VariableKind.New));
       GetVariableInfo("TestSamplesEnd").Local = true;
-      AddVariable(new Core.Variable("TestSamplesEnd", new IntData()));
+      AddVariable(new Variable("TestSamplesEnd", new IntData()));
     }
 
-    public override Core.IView CreateView() {
+    public override IView CreateView() {
       return new ProblemInjectorView(this);
     }
 
-    public override Core.IOperation Apply(Core.IScope scope) {
-      foreach(Core.VariableInfo info in VariableInfos) {
+    public override IOperation Apply(IScope scope) {
+      foreach(VariableInfo info in VariableInfos) {
         if(info.Local) {
-          Core.IVariable var = GetVariable(info.FormalName);
-          if(var != null) scope.AddVariable(new Core.Variable(info.ActualName, (Core.IItem)var.Value.Clone()));
+          IVariable var = GetVariable(info.FormalName);
+          if(var != null) scope.AddVariable(new Variable(info.ActualName, (IItem)var.Value.Clone()));
         }
       }

trunk/sources/HeuristicLab.Modeling/3.2/ProblemInjectorView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.GP.StructureIdentification {
+namespace HeuristicLab.Modeling {
   partial class ProblemInjectorView {
     /// <summary> 

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

@@ -29 +29 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Operators;
 using HeuristicLab.DataAnalysis;
 
-namespace HeuristicLab.GP.StructureIdentification {
+namespace HeuristicLab.Modeling {
   public partial class ProblemInjectorView : ViewBase {
     public ProblemInjector ProblemInjector {

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

@@ -24 +24 @@
 using System.Text;
 using System.Xml;
-using Core = HeuristicLab.Core;
+using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Operators;
 using HeuristicLab.DataAnalysis;
 
-namespace HeuristicLab.GP.StructureIdentification.TimeSeries {
-  public class ProblemInjector : HeuristicLab.GP.StructureIdentification.ProblemInjector {
+namespace HeuristicLab.Modeling {
+  public class TimeSeriesProblemInjector : ProblemInjector {
 
     public override string Description {
       get {
-        return "Problem injector for time series structure identification.";
+        return "Problem injector for time series problems.";
       }
     }
 
-    public ProblemInjector()
+    public TimeSeriesProblemInjector()
       : base() {
       AddVariableInfo(new Core.VariableInfo("Autoregressive", "Autoregressive modelling includes previous values of the target variable to predict future values.", typeof(BoolData), Core.VariableKind.New));

@@ -1 +1 @@
 bin
 obj
+*.user