Changeset 16413 for branches

Timestamp:

12/20/18 10:22:45 (6 years ago)

Author:

chaider

Message:

#2971

• Added parameter VariableRanges to RegressionProblemData
• Added VariableRanges class
• Added View class for VariableRanges

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Data.Views/3.3/VariableRangesView.Designer.cs (added)
• HeuristicLab.Data.Views/3.3/VariableRangesView.cs (added)
• HeuristicLab.Data.Views/3.3/VariableRangesView.resx (added)
• HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Data/3.3/Interfaces/IVariableRanges.cs (copied) (copied from branches/2971_named_intervals/HeuristicLab.Data/3.3/Interfaces/IStringConvertibleMatrix.cs) (2 diffs)
• HeuristicLab.Data/3.3/VariableRanges.cs (added)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs (modified) (4 diffs)

branches/2971_named_intervals/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj

@@ -41 +41 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -51 +51 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -206 +206 @@
     <Compile Include="StringConvertibleValueTupleView.Designer.cs">
       <DependentUpon>StringConvertibleValueTupleView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="VariableRangesView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="VariableRangesView.Designer.cs">
+      <DependentUpon>VariableRangesView.cs</DependentUpon>
     </Compile>
     <None Include="Plugin.cs.frame" />
@@ -279 +285 @@
       <Install>true</Install>
     </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="VariableRangesView.resx">
+      <DependentUpon>VariableRangesView.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/2971_named_intervals/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj

@@ -41 +41 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -123 +123 @@
       <HintPath>..\..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -132 +136 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="VariableRanges.cs" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="BoolArray.cs" />
@@ -139 +144 @@
     <Compile Include="ComparisonType.cs" />
     <Compile Include="EnumValue.cs" />
+    <Compile Include="Interfaces\IVariableRanges.cs" />
     <Compile Include="Interfaces\IValueTypeArray.cs" />
     <Compile Include="Path Types\DirectoryValue.cs" />

branches/2971_named_intervals/HeuristicLab.Data/3.3/Interfaces/IVariableRanges.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
+using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.Data {
-  public interface IStringConvertibleMatrix : IContent {
+  public interface IVariableRanges : IContent {
     int Rows { get; set; }
     int Columns { get; set; }
@@ -35 +36 @@
 
     bool Validate(string value, out string errorMessage);
-    string GetValue(int rowIndex, int columnIndex);
-    bool SetValue(string value, int rowIndex, int columnIndex);
+    Interval GetValue(string variable);
+    bool SetValue(string variable, Interval value);
 
     event EventHandler ColumnsChanged;

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

@@ -34 +34 @@
   public class RegressionProblemData : DataAnalysisProblemData, IRegressionProblemData, IStorableContent {
     protected const string TargetVariableParameterName = "TargetVariable";
+    protected const string VariableRangesParameterName = "VariableRanges";
     public string Filename { get; set; }
 
@@ -91 +92 @@
       problemData.Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", (IntRange)new IntRange(0, 0).AsReadOnly()));
       problemData.Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>()));
+      problemData.Parameters.Add(new FixedValueParameter<VariableRanges>(VariableRangesParameterName, new VariableRanges()));
       emptyProblemData = problemData;
     }
@@ -98 +100 @@
       get { return (IConstrainedValueParameter<StringValue>)Parameters[TargetVariableParameterName]; }
     }
+
+    public IFixedValueParameter<VariableRanges> VariableRangesParameter {
+      get { return (IFixedValueParameter<VariableRanges>)Parameters[VariableRangesParameterName]; }
+    }
+
     public string TargetVariable {
       get { return TargetVariableParameter.Value.Value; }
@@ -152 +159 @@
       var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
       Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>(variables), variables.Where(x => x.Value == targetVariable).First()));
+      Parameters.Add(new FixedValueParameter<VariableRanges>(VariableRangesParameterName, new VariableRanges()));
       RegisterParameterEvents();
     }