Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/21/12 18:02:33 (13 years ago)
Author:
gkronber
Message:

#1847: merged trunk changes r7800:HEAD into gp move operators branch

Location:
branches/GP-MoveOperators
Files:
1 deleted
13 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/GP-MoveOperators

  • branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis

  • branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs

    r7736 r8085  
    131131        for (int col = 0; col < storableData.GetLength(1); col++) {
    132132          string columName = variableNames[col];
    133           var values = new List<double>();
    134           for (int row = 0; row < storableData.GetLength(0); row++) {
     133          var values = new List<double>(rows);
     134          for (int row = 0; row < rows; row++) {
    135135            values.Add(storableData[row, col]);
    136136          }

  • branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r7678 r8085  
    141141    <Compile Include="Interfaces\Regression\IRegressionEnsembleSolution.cs" />
    142142    <Compile Include="Implementation\Regression\RegressionSolutionBase.cs" />
     143    <Compile Include="OnlineCalculators\HoeffdingsDependenceCalculator.cs" />
    143144    <Compile Include="OnlineCalculators\OnlineMaxAbsoluteErrorCalculator.cs" />
    144145    <Compile Include="OnlineCalculators\OnlineMeanErrorCalculator.cs" />
    … …  
    180181    <Compile Include="Implementation\Regression\RegressionSolution.cs" />
    181182    <Compile Include="Plugin.cs" />
    182     <Compile Include="TableFileParser.cs" />
    183183    <Compile Include="Implementation\Classification\ThresholdCalculators\AccuracyMaximizationThresholdCalculator.cs" />
    184184    <Compile Include="Implementation\Classification\ThresholdCalculators\NormalDistributionCutPointsThresholdCalculator.cs" />
    … …  
    190190    <Compile Include="Interfaces\IDataAnalysisProblem.cs" />
    191191    <Compile Include="Properties\AssemblyInfo.cs" />
    192   </ItemGroup>
    193   <ItemGroup>
    194     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    195       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    196       <Name>HeuristicLab.Collections-3.3</Name>
    197       <Private>False</Private>
    198     </ProjectReference>
    199     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    200       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    201       <Name>HeuristicLab.Common.Resources-3.3</Name>
    202       <Private>False</Private>
    203     </ProjectReference>
    204     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    205       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    206       <Name>HeuristicLab.Common-3.3</Name>
    207       <Private>False</Private>
    208     </ProjectReference>
    209     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    210       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    211       <Name>HeuristicLab.Core-3.3</Name>
    212       <Private>False</Private>
    213     </ProjectReference>
    214     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    215       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    216       <Name>HeuristicLab.Data-3.3</Name>
    217       <Private>False</Private>
    218     </ProjectReference>
    219     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    220       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    221       <Name>HeuristicLab.Optimization-3.3</Name>
    222       <Private>False</Private>
    223     </ProjectReference>
    224     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    225       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    226       <Name>HeuristicLab.Parameters-3.3</Name>
    227       <Private>False</Private>
    228     </ProjectReference>
    229     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    230       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    231       <Name>HeuristicLab.Persistence-3.3</Name>
    232       <Private>False</Private>
    233     </ProjectReference>
    234     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    235       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    236       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    237       <Private>False</Private>
    238     </ProjectReference>
    239192  </ItemGroup>
    240193  <ItemGroup>
    … …  
    255208    </BootstrapperPackage>
    256209  </ItemGroup>
    257   <ItemGroup />
     210  <ItemGroup>
     211    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     212      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     213      <Name>HeuristicLab.Collections-3.3</Name>
     214      <Private>False</Private>
     215    </ProjectReference>
     216    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     217      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     218      <Name>HeuristicLab.Common.Resources-3.3</Name>
     219      <Private>False</Private>
     220    </ProjectReference>
     221    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     222      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     223      <Name>HeuristicLab.Common-3.3</Name>
     224      <Private>False</Private>
     225    </ProjectReference>
     226    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     227      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     228      <Name>HeuristicLab.Core-3.3</Name>
     229      <Private>False</Private>
     230    </ProjectReference>
     231    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     232      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     233      <Name>HeuristicLab.Data-3.3</Name>
     234      <Private>False</Private>
     235    </ProjectReference>
     236    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     237      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     238      <Name>HeuristicLab.Optimization-3.3</Name>
     239      <Private>False</Private>
     240    </ProjectReference>
     241    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     242      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     243      <Name>HeuristicLab.Parameters-3.3</Name>
     244      <Private>False</Private>
     245    </ProjectReference>
     246    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     247      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     248      <Name>HeuristicLab.Persistence-3.3</Name>
     249      <Private>False</Private>
     250    </ProjectReference>
     251    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     252      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     253      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     254      <Private>False</Private>
     255    </ProjectReference>
     256    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     257      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     258      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     259      <Private>False</Private>
     260    </ProjectReference>
     261  </ItemGroup>
    258262  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    259263  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblem.cs

    r7259 r8085  
    4040      ProblemData = new ClassificationProblemData();
    4141    }
    42 
    43     public override void ImportProblemDataFromFile(string fileName) {
    44       ClassificationProblemData problemData = ClassificationProblemData.ImportFromFile(fileName);
    45       ProblemData = problemData;
    46     }
    4742  }
    4843}

  • branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

    r7266 r8085  
    2222using System;
    2323using System.Collections.Generic;
    24 using System.IO;
    2524using System.Linq;
    2625using HeuristicLab.Common;
    … …  
    403402    }
    404403    #endregion
    405 
    406     #region Import from file
    407     public static ClassificationProblemData ImportFromFile(string fileName) {
    408       TableFileParser csvFileParser = new TableFileParser();
    409       csvFileParser.Parse(fileName);
    410 
    411       Dataset dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);
    412       dataset.Name = Path.GetFileName(fileName);
    413 
    414       ClassificationProblemData problemData = new ClassificationProblemData(dataset, dataset.DoubleVariables.Skip(1), dataset.DoubleVariables.First());
    415       problemData.Name = "Data imported from " + Path.GetFileName(fileName);
    416       return problemData;
    417     }
    418     #endregion
    419404  }
    420405}

  • branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblem.cs

    r7259 r8085  
    3838      ProblemData = new ClusteringProblemData();
    3939    }
    40 
    41     public override void ImportProblemDataFromFile(string fileName) {
    42       ClusteringProblemData problemData = ClusteringProblemData.ImportFromFile(fileName);
    43       ProblemData = problemData;
    44     }
    4540  }
    4641}

  • branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.cs

    r7259 r8085  
    2121
    2222using System.Collections.Generic;
    23 using System.IO;
    2423using HeuristicLab.Common;
    2524using HeuristicLab.Core;
    … …  
    9089      : base(dataset, allowedInputVariables) {
    9190    }
    92 
    93 
    94     #region Import from file
    95     public static ClusteringProblemData ImportFromFile(string fileName) {
    96       TableFileParser csvFileParser = new TableFileParser();
    97       csvFileParser.Parse(fileName);
    98 
    99       Dataset dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);
    100       dataset.Name = Path.GetFileName(fileName);
    101 
    102       ClusteringProblemData problemData = new ClusteringProblemData(dataset, dataset.DoubleVariables);
    103       problemData.Name = "Data imported from " + Path.GetFileName(fileName);
    104       return problemData;
    105     }
    106     #endregion
    10791  }
    10892}

  • branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblem.cs

    r7259 r8085  
    2626using HeuristicLab.Parameters;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Problems.Instances;
    2829
    2930namespace HeuristicLab.Problems.DataAnalysis {
    3031  [StorableClass]
    31   public abstract class DataAnalysisProblem<T> : Problem,
    32     IDataAnalysisProblem<T>
     32  public abstract class DataAnalysisProblem<T> : Problem, IDataAnalysisProblem<T>,
     33    IProblemInstanceConsumer<T>, IProblemInstanceExporter<T>
    3334    where T : class, IDataAnalysisProblemData {
    3435    private const string ProblemDataParameterName = "ProblemData";
    … …  
    9192    }
    9293
    93     public abstract void ImportProblemDataFromFile(string fileName);
     94    #region Import & Export
     95    public void Load(T data) {
     96      Name = data.Name;
     97      Description = data.Description;
     98      ProblemData = data;
     99      OnReset();
     100    }
     101
     102    public T Export() {
     103      return ProblemData;
     104    }
     105    #endregion
    94106  }
    95107}

  • branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs

    r7259 r8085  
    4040      ProblemData = new RegressionProblemData();
    4141    }
    42 
    43     public override void ImportProblemDataFromFile(string fileName) {
    44       RegressionProblemData problemData = RegressionProblemData.ImportFromFile(fileName);
    45       ProblemData = problemData;
    46     }
    4742  }
    4843}

  • branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

    r7259 r8085  
    2222using System;
    2323using System.Collections.Generic;
    24 using System.IO;
    2524using System.Linq;
    2625using HeuristicLab.Common;
    … …  
    136135      OnChanged();
    137136    }
    138 
    139     #region Import from file
    140     public static RegressionProblemData ImportFromFile(string fileName) {
    141       TableFileParser csvFileParser = new TableFileParser();
    142       csvFileParser.Parse(fileName);
    143 
    144       Dataset dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);
    145       dataset.Name = Path.GetFileName(fileName);
    146 
    147       RegressionProblemData problemData = new RegressionProblemData(dataset, dataset.DoubleVariables.Skip(1), dataset.DoubleVariables.First());
    148       problemData.Name = "Data imported from " + Path.GetFileName(fileName);
    149       return problemData;
    150     }
    151     #endregion
    152137  }
    153138}

  • branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblem.cs

    r7259 r8085  
    2929    IDataAnalysisProblemData ProblemData { get; }
    3030    event EventHandler ProblemDataChanged;
    31 
    32     void ImportProblemDataFromFile(string fileName);
    3331  }
    3432

  • branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis/3.4/Plugin.cs.frame

    r7259 r8085  
    3636  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3737  [PluginDependency("HeuristicLab.Persistence", "3.3")]
     38  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    3839  public class HeuristicLabProblemsDataAnalysisPlugin : PluginBase {
    3940  }
Note: See TracChangeset for help on using the changeset viewer.