Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5484


Ignore:
Timestamp:
02/16/11 10:52:22 (13 years ago)
Author:
mkommend
Message:

Prepared 3.4 project stubs for refactoring and added interfaces in Problems.DataAnalysis 3.4 (ticket #1418).

Location:
branches/DataAnalysis Refactoring
Files:
6 added
15 deleted
11 edited
7 copied
1 moved

Legend:

Unmodified
Added
Removed

  • branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj

    r5477 r5484  
    114114  </ItemGroup>
    115115  <ItemGroup>
    116     <Compile Include="CrossValidationView.cs">
    117       <SubType>UserControl</SubType>
    118     </Compile>
    119     <Compile Include="CrossValidationView.Designer.cs">
    120       <DependentUpon>CrossValidationView.cs</DependentUpon>
    121     </Compile>
    122116    <Compile Include="HeuristicLabAlgorithmsDataAnalysisViewsPlugin.cs" />
    123117    <Compile Include="Properties\AssemblyInfo.cs" />
    … …  
    129123  </ItemGroup>
    130124  <ItemGroup>
    131     <ProjectReference Include="..\..\HeuristicLab.Algorithms.DataAnalysis\3.3\HeuristicLab.Algorithms.DataAnalysis-3.3.csproj">
    132       <Project>{A8D5676D-9662-437A-B44D-ECB4046CDE12}</Project>
    133       <Name>HeuristicLab.Algorithms.DataAnalysis-3.3</Name>
     125    <ProjectReference Include="..\..\HeuristicLab.Algorithms.DataAnalysis\3.4\HeuristicLab.Algorithms.DataAnalysis-3.4.csproj">
     126      <Project>{2E782078-FA81-4B70-B56F-74CE38DAC6C8}</Project>
     127      <Name>HeuristicLab.Algorithms.DataAnalysis-3.4</Name>
    134128    </ProjectReference>
    135129    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    … …  
    181175      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    182176    </ProjectReference>
    183     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
    184       <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
    185       <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
     177    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
     178      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
     179      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    186180    </ProjectReference>
    187181  </ItemGroup>

  • branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

    r5477 r5484  
    107107  </ItemGroup>
    108108  <ItemGroup>
    109     <Compile Include="CrossValidation.cs" />
    110     <Compile Include="SupportVectorMachine.cs" />
    111109    <Compile Include="HeuristicLabAlgorithmsDataAnalysisPlugin.cs" />
    112     <Compile Include="LinearRegression.cs" />
    113110    <Compile Include="Properties\AssemblyInfo.cs" />
    114111  </ItemGroup>
    … …  
    135132    </ProjectReference>
    136133    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    137       <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    138       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
     134      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
     135      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    139136    </ProjectReference>
    140137    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    … …  
    159156    </ProjectReference>
    160157    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Regression-3.4.csproj">
    161       <Project>{BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}</Project>
    162       <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.3</Name>
     158      <Project>{BD16E72E-8F62-4293-A014-6E3D450DF091}</Project>
     159      <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.4</Name>
    163160    </ProjectReference>
    164161    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    165       <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
    166       <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
     162      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
     163      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    167164    </ProjectReference>
    168165  </ItemGroup>
    169166  <ItemGroup>
    170167    <None Include="HeuristicLab.snk" />
    171     <None Include="HeuristicLabAlgorithmsDataAnalysisPlugin.cs.frame" />
    172168    <None Include="Properties\AssemblyInfo.frame" />
    173169  </ItemGroup>

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt.Views/3.4/HeuristicLab.Problems.ArtificialAnt.Views-3.4.csproj

    r5477 r5484  
    146146      <Name>HeuristicLab.Data-3.3</Name>
    147147    </ProjectReference>
    148     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj">
    149       <Project>{6F42C5F8-16CD-43EE-8208-FD4573A69D85}</Project>
    150       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3</Name>
    151     </ProjectReference>
    152     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    153       <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    154       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
     148    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj">
     149      <Project>{423BD94F-963A-438E-BA45-3BB3D61CD03B}</Project>
     150      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4</Name>
     151    </ProjectReference>
     152    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
     153      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
     154      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    155155    </ProjectReference>
    156156    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    … …  
    174174      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    175175    </ProjectReference>
    176     <ProjectReference Include="..\..\HeuristicLab.Problems.ArtificialAnt\3.3\HeuristicLab.Problems.ArtificialAnt-3.3.csproj">
    177       <Project>{F5C0ECAC-EDBA-4024-872A-1F74AFCB20B4}</Project>
    178       <Name>HeuristicLab.Problems.ArtificialAnt-3.3</Name>
     176    <ProjectReference Include="..\..\HeuristicLab.Problems.ArtificialAnt\3.4\HeuristicLab.Problems.ArtificialAnt-3.4.csproj">
     177      <Project>{0C67A033-F6D9-4237-B3CA-C033A44706BE}</Project>
     178      <Name>HeuristicLab.Problems.ArtificialAnt-3.4</Name>
    179179    </ProjectReference>
    180180  </ItemGroup>

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt/3.4/HeuristicLab.Problems.ArtificialAnt-3.4.csproj

    r5477 r5484  
    150150      <Name>HeuristicLab.Data-3.3</Name>
    151151    </ProjectReference>
    152     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    153       <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    154       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
     152    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
     153      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
     154      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    155155    </ProjectReference>
    156156    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Classification/3.4/HeuristicLab.Problems.DataAnalysis.Classification-3.4.csproj

    r5474 r5484  
    141141      <Name>HeuristicLab.Data-3.3</Name>
    142142    </ProjectReference>
    143     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    144       <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    145       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    146     </ProjectReference>
    147143    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    148144      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    … …  
    165161      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    166162    </ProjectReference>
    167     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj">
    168       <Project>{BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}</Project>
    169       <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.3</Name>
    170     </ProjectReference>
    171     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
    172       <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
    173       <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
    174     </ProjectReference>
    175163  </ItemGroup>
    176164  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/VariableCondition.cs

    r5467 r5484  
    144144    #region persistence and cloning
    145145    [StorableConstructor]
    146     protected VariableCondition(bool deserializing) : base(deserializing) { }
    147     protected VariableCondition(VariableCondition original, Cloner cloner)
     146    private VariableCondition(bool deserializing) : base(deserializing) { }
     147    private VariableCondition(VariableCondition original, Cloner cloner)
    148148      : base(original, cloner) {
    149149      thresholdInitializerMu = original.thresholdInitializerMu;

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r5474 r5484  
    108108  </ItemGroup>
    109109  <ItemGroup>
     110    <Compile Include="Dataset.cs" />
     111    <Compile Include="Interfaces\IDataAnalysisEvaluator.cs" />
     112    <Compile Include="Interfaces\IDataAnalysisProblemData.cs" />
     113    <Compile Include="Interfaces\IDataAnalysisSolution.cs" />
     114    <Compile Include="Interfaces\IDataAnalysisSolutionCreator.cs" />
    110115    <Compile Include="TableFileParser.cs" />
    111116    <None Include="HeuristicLab.snk" />
    112117    <None Include="HeuristicLabProblemsDataAnalysisPlugin.cs.frame" />
    113118    <None Include="Properties\AssemblyInfo.frame" />
    114     <Compile Include="Evaluators\OnlineCovarianceEvaluator.cs" />
    115     <Compile Include="Evaluators\OnlineMeanAndVarianceCalculator.cs" />
    116     <Compile Include="Evaluators\OnlineNormalizedMeanSquaredErrorEvaluator.cs" />
    117     <Compile Include="DataAnalysisSolution.cs" />
    118     <Compile Include="DataAnalysisProblem.cs" />
    119     <Compile Include="DataAnalysisProblemData.cs" />
    120     <Compile Include="DataFormatException.cs" />
    121     <Compile Include="Dataset.cs" />
    122     <Compile Include="Evaluators\OnlineMeanAbsolutePercentageErrorEvaluator.cs" />
    123     <Compile Include="Evaluators\OnlineMeanSquaredErrorEvaluator.cs" />
    124     <Compile Include="Evaluators\OnlinePearsonsRSquaredEvaluator.cs" />
    125     <Compile Include="Evaluators\SimpleEvaluator.cs" />
    126     <Compile Include="Evaluators\SimpleMeanAbsolutePercentageErrorEvaluator.cs" />
    127     <Compile Include="Evaluators\SimpleMeanAbsolutePercentageOfRangeErrorEvaluator.cs" />
    128     <Compile Include="Evaluators\SimpleMSEEvaluator.cs" />
    129     <Compile Include="Evaluators\SimpleNMSEEvaluator.cs" />
    130     <Compile Include="Evaluators\SimpleRSquaredEvaluator.cs" />
    131     <Compile Include="Evaluators\SimpleVarianceAccountedForEvaluator.cs" />
     119    <Compile Include="Online Evaluators\OnlineCovarianceEvaluator.cs" />
     120    <Compile Include="Online Evaluators\OnlineMeanAndVarianceCalculator.cs" />
     121    <Compile Include="Online Evaluators\OnlineNormalizedMeanSquaredErrorEvaluator.cs" />
     122    <Compile Include="Online Evaluators\OnlineMeanAbsolutePercentageErrorEvaluator.cs" />
     123    <Compile Include="Online Evaluators\OnlineMeanSquaredErrorEvaluator.cs" />
     124    <Compile Include="Online Evaluators\OnlinePearsonsRSquaredEvaluator.cs" />
    132125    <Compile Include="HeuristicLabProblemsDataAnalysisPlugin.cs" />
    133     <Compile Include="Interfaces\ILaggedTreeNode.cs" />
    134     <Compile Include="Interfaces\ISingleObjectiveDataAnalysisProblem.cs" />
    135126    <Compile Include="Interfaces\IDataAnalysisModel.cs" />
    136127    <Compile Include="Interfaces\IDataAnalysisProblem.cs" />
    137     <Compile Include="Interfaces\IOnlineEvaluator.cs" />
    138     <Compile Include="MatrixExtensions.cs" />
     128    <Compile Include="Online Evaluators\IOnlineEvaluator.cs" />
    139129    <Compile Include="Properties\AssemblyInfo.cs" />
    140     <Compile Include="RandomEnumerable.cs" />
    141130  </ItemGroup>
    142131  <ItemGroup>
    … …  
    160149      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    161150      <Name>HeuristicLab.Data-3.3</Name>
    162     </ProjectReference>
    163     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    164       <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    165       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    166151    </ProjectReference>
    167152    <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisModel.cs

    r5445 r5484  
    2525namespace HeuristicLab.Problems.DataAnalysis {
    2626  public interface IDataAnalysisModel : INamedItem {
    27     IEnumerable<double> GetEstimatedValues(DataAnalysisProblemData problemData, int start, int end);
     27    IEnumerable<double> GetEstimatedValues(IDataAnalysisProblemData problemData, int start, int end);
    2828  }
    2929}

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblem.cs

    r5445 r5484  
    2424namespace HeuristicLab.Problems.DataAnalysis {
    2525  public interface IDataAnalysisProblem : IProblem {
    26     DataAnalysisProblemData DataAnalysisProblemData { get; }
     26    IDataAnalysisProblemData DataAnalysisProblemData { get; }
     27    new IDataAnalysisEvaluator Evaluator { get; }
     28    new IDataAnalysisSolutionCreator SolutionCreator { get; }
    2729  }
    2830}

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/TableFileParser.cs

    r5474 r5484  
    2525using System.IO;
    2626using System.Linq;
     27using System.Runtime.Serialization;
    2728using System.Text;
    2829
    … …  
    366367    }
    367368    #endregion
     369
     370    [Serializable]
     371    private class DataFormatException : Exception {
     372      private int line;
     373      public int Line {
     374        get { return line; }
     375      }
     376      private string token;
     377      public string Token {
     378        get { return token; }
     379      }
     380      public DataFormatException(string message, string token, int line)
     381        : base(message + "\nToken: " + token + " (line: " + line + ")") {
     382        this.token = token;
     383        this.line = line;
     384      }
     385
     386      public DataFormatException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     387    }
    368388  }
    369389}

  • branches/DataAnalysis Refactoring/HeuristicLab.Random/3.3/HeuristicLab.Random-3.3.csproj

    r5163 r5484  
    119119    <Compile Include="Properties\AssemblyInfo.cs" />
    120120    <Compile Include="RandomCreator.cs" />
     121    <Compile Include="RandomEnumerable.cs" />
    121122    <Compile Include="UniformRandomizer.cs" />
    122123  </ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.