Free cookie consent management tool by TermsFeed Policy Generator

Changeset 1856


Ignore:
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
Files:
2 added
13 edited
6 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.GP.StructureIdentification.Classification/3.3/HeuristicLab.GP.StructureIdentification.Classification-3.3.csproj

    r1534 r1856  
    8989    <Compile Include="MulticlassOneVsOneAnalyzer.cs" />
    9090    <Compile Include="OffspringSelectionGP.cs" />
    91     <Compile Include="ProblemInjector.cs" />
    9291    <Compile Include="Properties\AssemblyInfo.cs" />
    9392    <Compile Include="ROCAnalyzer.cs" />
    … …  
    118117      <Project>{1F1CF3ED-374C-4288-995B-93F6B872F571}</Project>
    119118      <Name>HeuristicLab.GP-3.3</Name>
     119    </ProjectReference>
     120    <ProjectReference Include="..\..\HeuristicLab.Modeling\3.2\HeuristicLab.Modeling-3.2.csproj">
     121      <Project>{80F7FADA-549D-4151-8856-79B620A50DBA}</Project>
     122      <Name>HeuristicLab.Modeling-3.2</Name>
    120123    </ProjectReference>
    121124    <ProjectReference Include="..\..\HeuristicLab.Operators\3.2\HeuristicLab.Operators-3.2.csproj">

  • trunk/sources/HeuristicLab.GP.StructureIdentification.Classification/3.3/HeuristicLabGPClassificationPlugin.cs

    r1529 r1856  
    3434  [Dependency(Dependency = "HeuristicLab.GP-3.3")]
    3535  [Dependency(Dependency = "HeuristicLab.GP.StructureIdentification-3.3")]
     36  [Dependency(Dependency = "HeuristicLab.Modeling-3.3")]
    3637  [Dependency(Dependency = "HeuristicLab.Operators-3.2")]
    3738  [Dependency(Dependency = "HeuristicLab.Random-3.2")]

  • trunk/sources/HeuristicLab.GP.StructureIdentification.Classification/3.3/OffspringSelectionGP.cs

    r1529 r1856  
    3030using HeuristicLab.Random;
    3131using HeuristicLab.Data;
     32using HeuristicLab.Modeling;
    3233
    3334namespace HeuristicLab.GP.StructureIdentification.Classification {

  • trunk/sources/HeuristicLab.GP.StructureIdentification.Classification/3.3/StandardGP.cs

    r1529 r1856  
    3131using HeuristicLab.Data;
    3232using HeuristicLab.Operators;
     33using HeuristicLab.Modeling;
    3334
    3435namespace HeuristicLab.GP.StructureIdentification.Classification {

  • trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/HeuristicLab.GP.StructureIdentification.TimeSeries-3.3.csproj

    r1534 r1856  
    9494      <DependentUpon>OffspringSelectionGpEditor.cs</DependentUpon>
    9595    </Compile>
    96     <Compile Include="ProblemInjector.cs" />
    9796    <Compile Include="ProfitEvaluator.cs" />
    9897    <Compile Include="Properties\AssemblyInfo.cs" />
    … …  
    135134      <Name>HeuristicLab.Logging-3.2</Name>
    136135    </ProjectReference>
     136    <ProjectReference Include="..\..\HeuristicLab.Modeling\3.2\HeuristicLab.Modeling-3.2.csproj">
     137      <Project>{80F7FADA-549D-4151-8856-79B620A50DBA}</Project>
     138      <Name>HeuristicLab.Modeling-3.2</Name>
     139    </ProjectReference>
    137140    <ProjectReference Include="..\..\HeuristicLab.Operators\3.2\HeuristicLab.Operators-3.2.csproj">
    138141      <Project>{A9983BA2-B3B2-475E-8E2C-62050B71D1C5}</Project>

  • trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/HeuristicLabGPTimeSeriesPlugin.cs

    r1529 r1856  
    3434  [Dependency(Dependency = "HeuristicLab.GP-3.3")]
    3535  [Dependency(Dependency = "HeuristicLab.GP.StructureIdentification-3.3")]
     36  [Dependency(Dependency = "HeuristicLab.Modeling-3.2")]
    3637  [Dependency(Dependency = "HeuristicLab.Logging-3.2")]
    3738  [Dependency(Dependency = "HeuristicLab.Operators-3.2")]

  • trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/OffspringSelectionGP.cs

    r1529 r1856  
    3131using HeuristicLab.Operators;
    3232using HeuristicLab.Logging;
     33using HeuristicLab.Modeling;
    3334
    3435namespace HeuristicLab.GP.StructureIdentification.TimeSeries {

  • trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/StandardGP.cs

    r1529 r1856  
    3131using HeuristicLab.Operators;
    3232using HeuristicLab.Logging;
     33using HeuristicLab.Modeling;
    3334
    3435namespace HeuristicLab.GP.StructureIdentification.TimeSeries {

  • trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/HeuristicLab.GP.StructureIdentification-3.3.csproj

    r1836 r1856  
    102102    <Compile Include="OffSpringSelectionGpEditor.Designer.cs">
    103103      <DependentUpon>OffSpringSelectionGpEditor.cs</DependentUpon>
    104     </Compile>
    105     <Compile Include="ProblemInjector.cs" />
    106     <Compile Include="ProblemInjectorView.cs">
    107       <SubType>UserControl</SubType>
    108     </Compile>
    109     <Compile Include="ProblemInjectorView.Designer.cs">
    110       <DependentUpon>ProblemInjectorView.cs</DependentUpon>
    111104    </Compile>
    112105    <Compile Include="StandardGpEditor.cs">
    … …  
    180173      <Name>HeuristicLab.Logging-3.2</Name>
    181174    </ProjectReference>
     175    <ProjectReference Include="..\..\HeuristicLab.Modeling\3.2\HeuristicLab.Modeling-3.2.csproj">
     176      <Project>{80F7FADA-549D-4151-8856-79B620A50DBA}</Project>
     177      <Name>HeuristicLab.Modeling-3.2</Name>
     178    </ProjectReference>
    182179    <ProjectReference Include="..\..\HeuristicLab.Operators.Programmable\3.2\HeuristicLab.Operators.Programmable-3.2.csproj">
    183180      <Project>{E3CCBFC6-900C-41B6-AFB8-6646DB097435}</Project>
    … …  
    212209    <EmbeddedResource Include="OffSpringSelectionGpEditor.resx">
    213210      <DependentUpon>OffSpringSelectionGpEditor.cs</DependentUpon>
    214     </EmbeddedResource>
    215     <EmbeddedResource Include="ProblemInjectorView.resx">
    216       <DependentUpon>ProblemInjectorView.cs</DependentUpon>
    217211    </EmbeddedResource>
    218212    <EmbeddedResource Include="StandardGpEditor.resx">

  • trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/HeuristicLabGPStructureIdentificationPlugin.cs

    r1529 r1856  
    4141  [Dependency(Dependency = "HeuristicLab.Selection.OffspringSelection-3.2")]
    4242  [Dependency(Dependency = "HeuristicLab.SequentialEngine-3.2")]
     43  [Dependency(Dependency = "HeuristicLab.Modeling-3.2")]
    4344  public class HeuristicLabGPStructureIdentificationPlugin : PluginBase {
    4445  }

  • trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/StandardGP.cs

    r1529 r1856  
    3434using HeuristicLab.Data;
    3535using HeuristicLab.Operators.Programmable;
     36using HeuristicLab.Modeling;
    3637
    3738namespace HeuristicLab.GP.StructureIdentification {

  • trunk/sources/HeuristicLab.Modeling/3.2

    • Property svn:ignore

      •  

        old new  
        11bin
        22obj
         3*.user

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

    r1854 r1856  
    2424using System.Text;
    2525using System.Xml;
    26 using Core = HeuristicLab.Core;
     26using HeuristicLab.Core;
    2727using HeuristicLab.Data;
    2828
    29 namespace HeuristicLab.GP.StructureIdentification.Classification {
    30   public class ProblemInjector : HeuristicLab.GP.StructureIdentification.ProblemInjector {
     29namespace HeuristicLab.Modeling {
     30  public class ClassificationProblemInjector : ProblemInjector {
    3131
    3232    public override string Description {
    3333      get {
    34         return "Problem injector for classification structure identification.";
     34        return "Problem injector for classification problems.";
    3535      }
    3636    }
    3737
    38     public ProblemInjector()
     38    public ClassificationProblemInjector()
    3939      : base() {
    4040      AddVariableInfo(new Core.VariableInfo("TargetClassValues", "TargetClassValues", typeof(ItemList<DoubleData>), Core.VariableKind.New));

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

    r1854 r1856  
    2424using System.Text;
    2525using System.Xml;
    26 using Core = HeuristicLab.Core;
     26using HeuristicLab.Core;
    2727using HeuristicLab.Data;
    28 using HeuristicLab.Operators;
    2928using HeuristicLab.DataAnalysis;
    3029
    31 namespace HeuristicLab.GP.StructureIdentification {
    32   public class ProblemInjector : Core.OperatorBase {
     30namespace HeuristicLab.Modeling {
     31  public class ProblemInjector : OperatorBase {
    3332    public override string Description {
    34       get { return @"Injects the necessary variables for a structure identification problem."; }
     33      get { return @"Injects the necessary variables for a data-based modeling problem."; }
    3534    }
    3635
    3736    public ProblemInjector()
    3837      : base() {
    39       AddVariableInfo(new Core.VariableInfo("Dataset", "Dataset", typeof(Dataset), Core.VariableKind.New));
     38      AddVariableInfo(new VariableInfo("Dataset", "Dataset", typeof(Dataset), VariableKind.New));
    4039      GetVariableInfo("Dataset").Local = true;
    41       AddVariable(new Core.Variable("Dataset", new Dataset()));
     40      AddVariable(new Variable("Dataset", new Dataset()));
    4241
    43       AddVariableInfo(new Core.VariableInfo("TargetVariable", "TargetVariable", typeof(IntData), Core.VariableKind.New));
     42      AddVariableInfo(new VariableInfo("TargetVariable", "TargetVariable", typeof(IntData), VariableKind.New));
    4443      GetVariableInfo("TargetVariable").Local = true;
    45       AddVariable(new Core.Variable("TargetVariable", new IntData()));
     44      AddVariable(new Variable("TargetVariable", new IntData()));
    4645
    47       AddVariableInfo(new Core.VariableInfo("AllowedFeatures", "Indexes of allowed input variables", typeof(ItemList<IntData>), Core.VariableKind.New));
     46      AddVariableInfo(new VariableInfo("AllowedFeatures", "Indexes of allowed input variables", typeof(ItemList<IntData>), VariableKind.New));
    4847      GetVariableInfo("AllowedFeatures").Local = true;
    49       AddVariable(new Core.Variable("AllowedFeatures", new ItemList<IntData>()));
     48      AddVariable(new Variable("AllowedFeatures", new ItemList<IntData>()));
    5049
    51       AddVariableInfo(new Core.VariableInfo("TrainingSamplesStart", "TrainingSamplesStart", typeof(IntData), Core.VariableKind.New));
     50      AddVariableInfo(new VariableInfo("TrainingSamplesStart", "TrainingSamplesStart", typeof(IntData), VariableKind.New));
    5251      GetVariableInfo("TrainingSamplesStart").Local = true;
    53       AddVariable(new Core.Variable("TrainingSamplesStart", new IntData()));
     52      AddVariable(new Variable("TrainingSamplesStart", new IntData()));
    5453
    55       AddVariableInfo(new Core.VariableInfo("TrainingSamplesEnd", "TrainingSamplesEnd", typeof(IntData), Core.VariableKind.New));
     54      AddVariableInfo(new VariableInfo("TrainingSamplesEnd", "TrainingSamplesEnd", typeof(IntData), VariableKind.New));
    5655      GetVariableInfo("TrainingSamplesEnd").Local = true;
    57       AddVariable(new Core.Variable("TrainingSamplesEnd", new IntData()));
     56      AddVariable(new Variable("TrainingSamplesEnd", new IntData()));
    5857
    59       AddVariableInfo(new Core.VariableInfo("ValidationSamplesStart", "ValidationSamplesStart", typeof(IntData), Core.VariableKind.New));
     58      AddVariableInfo(new VariableInfo("ValidationSamplesStart", "ValidationSamplesStart", typeof(IntData), VariableKind.New));
    6059      GetVariableInfo("ValidationSamplesStart").Local = true;
    61       AddVariable(new Core.Variable("ValidationSamplesStart", new IntData()));
     60      AddVariable(new Variable("ValidationSamplesStart", new IntData()));
    6261
    63       AddVariableInfo(new Core.VariableInfo("ValidationSamplesEnd", "ValidationSamplesEnd", typeof(IntData), Core.VariableKind.New));
     62      AddVariableInfo(new VariableInfo("ValidationSamplesEnd", "ValidationSamplesEnd", typeof(IntData), VariableKind.New));
    6463      GetVariableInfo("ValidationSamplesEnd").Local = true;
    65       AddVariable(new Core.Variable("ValidationSamplesEnd", new IntData()));
     64      AddVariable(new Variable("ValidationSamplesEnd", new IntData()));
    6665
    67       AddVariableInfo(new Core.VariableInfo("TestSamplesStart", "TestSamplesStart", typeof(IntData), Core.VariableKind.New));
     66      AddVariableInfo(new VariableInfo("TestSamplesStart", "TestSamplesStart", typeof(IntData), VariableKind.New));
    6867      GetVariableInfo("TestSamplesStart").Local = true;
    69       AddVariable(new Core.Variable("TestSamplesStart", new IntData()));
     68      AddVariable(new Variable("TestSamplesStart", new IntData()));
    7069
    71       AddVariableInfo(new Core.VariableInfo("TestSamplesEnd", "TestSamplesEnd", typeof(IntData), Core.VariableKind.New));
     70      AddVariableInfo(new VariableInfo("TestSamplesEnd", "TestSamplesEnd", typeof(IntData), VariableKind.New));
    7271      GetVariableInfo("TestSamplesEnd").Local = true;
    73       AddVariable(new Core.Variable("TestSamplesEnd", new IntData()));
     72      AddVariable(new Variable("TestSamplesEnd", new IntData()));
    7473    }
    7574
    76     public override Core.IView CreateView() {
     75    public override IView CreateView() {
    7776      return new ProblemInjectorView(this);
    7877    }
    7978
    80     public override Core.IOperation Apply(Core.IScope scope) {
    81       foreach(Core.VariableInfo info in VariableInfos) {
     79    public override IOperation Apply(IScope scope) {
     80      foreach(VariableInfo info in VariableInfos) {
    8281        if(info.Local) {
    83           Core.IVariable var = GetVariable(info.FormalName);
    84           if(var != null) scope.AddVariable(new Core.Variable(info.ActualName, (Core.IItem)var.Value.Clone()));
     82          IVariable var = GetVariable(info.FormalName);
     83          if(var != null) scope.AddVariable(new Variable(info.ActualName, (IItem)var.Value.Clone()));
    8584        }
    8685      }

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

    r1854 r1856  
    2020#endregion
    2121
    22 namespace HeuristicLab.GP.StructureIdentification {
     22namespace HeuristicLab.Modeling {
    2323  partial class ProblemInjectorView {
    2424    /// <summary>

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

    r1854 r1856  
    2929using HeuristicLab.Core;
    3030using HeuristicLab.Data;
    31 using HeuristicLab.Operators;
    3231using HeuristicLab.DataAnalysis;
    3332
    34 namespace HeuristicLab.GP.StructureIdentification {
     33namespace HeuristicLab.Modeling {
    3534  public partial class ProblemInjectorView : ViewBase {
    3635    public ProblemInjector ProblemInjector {

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

    r1854 r1856  
    2424using System.Text;
    2525using System.Xml;
    26 using Core = HeuristicLab.Core;
     26using HeuristicLab.Core;
    2727using HeuristicLab.Data;
    28 using HeuristicLab.Operators;
    2928using HeuristicLab.DataAnalysis;
    3029
    31 namespace HeuristicLab.GP.StructureIdentification.TimeSeries {
    32   public class ProblemInjector : HeuristicLab.GP.StructureIdentification.ProblemInjector {
     30namespace HeuristicLab.Modeling {
     31  public class TimeSeriesProblemInjector : ProblemInjector {
    3332
    3433    public override string Description {
    3534      get {
    36         return "Problem injector for time series structure identification.";
     35        return "Problem injector for time series problems.";
    3736      }
    3837    }
    3938
    40     public ProblemInjector()
     39    public TimeSeriesProblemInjector()
    4140      : base() {
    4241      AddVariableInfo(new Core.VariableInfo("Autoregressive", "Autoregressive modelling includes previous values of the target variable to predict future values.", typeof(BoolData), Core.VariableKind.New));

  • trunk/sources/HeuristicLab.sln

    r1855 r1856  
    203203Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibSVM", "LibSVM\LibSVM.csproj", "{A16F23B5-FB62-499E-A831-26953AA56FE2}"
    204204EndProject
    205 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Modeling", "HeuristicLab.Modeling\3.2\HeuristicLab.Modeling.csproj", "{80F7FADA-549D-4151-8856-79B620A50DBA}"
     205Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Modeling-3.2", "HeuristicLab.Modeling\3.2\HeuristicLab.Modeling-3.2.csproj", "{80F7FADA-549D-4151-8856-79B620A50DBA}"
    206206EndProject
    207207Global
Note: See TracChangeset for help on using the changeset viewer.