- Timestamp:
- 12/20/11 13:54:57 (13 years ago)
- Location:
- branches/HeuristicLab.Hive.Azure
- Files:
-
- 5 deleted
- 12 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive.Azure
- Property svn:ignore
-
old new 4 4 *.suo 5 5 *.vsp 6 Doxygen 6 7 Google.ProtocolBuffers-0.9.1.dll 7 8 HeuristicLab 3.3.5.1.ReSharper.user 8 9 HeuristicLab 3.3.6.0.ReSharper.user 9 10 HeuristicLab.4.5.resharper.user 11 HeuristicLab.ExtLibs.6.0.ReSharper.user 10 12 HeuristicLab.resharper.user 11 13 ProtoGen.exe … … 16 18 bin 17 19 protoc.exe 18 HeuristicLab.ExtLibs.6.0.ReSharper.user19 Doxygen
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis (added) merged: 7011,7017,7021,7023,7043,7049,7097,7134,7167,7169
- Property svn:mergeinfo changed
-
branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj
r6866 r7215 94 94 <ItemGroup> 95 95 <Reference Include="LibSVM-1.6.3, Version=1.6.3.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 96 <HintPath>..\..\bin\LibSVM-1.6.3.dll</HintPath> 96 <HintPath>bin\LibSVM-1.6.3.dll</HintPath> 97 <Private>False</Private> 97 98 </Reference> 98 99 <Reference Include="System" /> … … 189 190 </ItemGroup> 190 191 <ItemGroup> 191 <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj"> 192 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project> 193 <Name>HeuristicLab.Collections-3.3</Name> 194 <Private>False</Private> 195 </ProjectReference> 196 <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj"> 197 <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project> 198 <Name>HeuristicLab.Common.Resources-3.3</Name> 199 <Private>False</Private> 200 </ProjectReference> 201 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj"> 202 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project> 203 <Name>HeuristicLab.Common-3.3</Name> 204 <Private>False</Private> 205 </ProjectReference> 206 <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj"> 207 <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project> 208 <Name>HeuristicLab.Core-3.3</Name> 209 <Private>False</Private> 210 </ProjectReference> 211 <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj"> 212 <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project> 213 <Name>HeuristicLab.Data-3.3</Name> 214 <Private>False</Private> 215 </ProjectReference> 216 <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj"> 217 <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project> 218 <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name> 219 <Private>False</Private> 220 </ProjectReference> 221 <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj"> 222 <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project> 223 <Name>HeuristicLab.Operators-3.3</Name> 224 <Private>False</Private> 225 </ProjectReference> 226 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj"> 227 <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project> 228 <Name>HeuristicLab.Optimization-3.3</Name> 229 <Private>False</Private> 230 </ProjectReference> 231 <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj"> 232 <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project> 233 <Name>HeuristicLab.Parameters-3.3</Name> 234 <Private>False</Private> 235 </ProjectReference> 236 <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj"> 237 <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project> 238 <Name>HeuristicLab.Persistence-3.3</Name> 239 <Private>False</Private> 240 </ProjectReference> 241 <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj"> 242 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project> 243 <Name>HeuristicLab.PluginInfrastructure-3.3</Name> 244 <Private>False</Private> 245 </ProjectReference> 246 <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj"> 247 <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project> 248 <Name>HeuristicLab.Random-3.3</Name> 249 <Private>False</Private> 250 </ProjectReference> 192 <Reference Include="HeuristicLab.Collections-3.3"> 193 <HintPath>..\..\bin\HeuristicLab.Collections-3.3.dll</HintPath> 194 <Private>False</Private> 195 </Reference> 196 <Reference Include="HeuristicLab.Common.Resources-3.3"> 197 <HintPath>..\..\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath> 198 <Private>False</Private> 199 </Reference> 200 <Reference Include="HeuristicLab.Common-3.3"> 201 <HintPath>..\..\bin\HeuristicLab.Common-3.3.dll</HintPath> 202 <Private>False</Private> 203 </Reference> 204 <Reference Include="HeuristicLab.Core-3.3"> 205 <HintPath>..\..\bin\HeuristicLab.Core-3.3.dll</HintPath> 206 <Private>False</Private> 207 </Reference> 208 <Reference Include="HeuristicLab.Data-3.3"> 209 <HintPath>..\..\bin\HeuristicLab.Data-3.3.dll</HintPath> 210 <Private>False</Private> 211 </Reference> 212 <Reference Include="HeuristicLab.Operators-3.3"> 213 <HintPath>..\..\bin\HeuristicLab.Operators-3.3.dll</HintPath> 214 <Private>False</Private> 215 </Reference> 216 <Reference Include="HeuristicLab.Optimization-3.3"> 217 <HintPath>..\..\bin\HeuristicLab.Optimization-3.3.dll</HintPath> 218 <Private>False</Private> 219 </Reference> 220 <Reference Include="HeuristicLab.Parameters-3.3"> 221 <HintPath>..\..\bin\HeuristicLab.Parameters-3.3.dll</HintPath> 222 <Private>False</Private> 223 </Reference> 224 <Reference Include="HeuristicLab.Persistence-3.3"> 225 <HintPath>..\..\bin\HeuristicLab.Persistence-3.3.dll</HintPath> 226 <Private>False</Private> 227 </Reference> 228 <Reference Include="HeuristicLab.PluginInfrastructure-3.3"> 229 <HintPath>..\..\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath> 230 <Private>False</Private> 231 </Reference> 232 <Reference Include="HeuristicLab.Random-3.3"> 233 <HintPath>..\..\bin\HeuristicLab.Random-3.3.dll</HintPath> 234 <Private>False</Private> 235 </Reference> 251 236 </ItemGroup> 252 237 <ItemGroup> … … 267 252 </BootstrapperPackage> 268 253 </ItemGroup> 269 <ItemGroup /> 254 <ItemGroup> 255 <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj"> 256 <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project> 257 <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name> 258 <Private>False</Private> 259 </ProjectReference> 260 </ItemGroup> 270 261 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 271 262 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj
r6974 r7215 122 122 <Compile Include="Implementation\Clustering\ClusteringProblemData.cs" /> 123 123 <Compile Include="Implementation\Clustering\ClusteringSolution.cs" /> 124 <Compile Include="Implementation\Regression\ConstantRegressionModel.cs" /> 125 <Compile Include="Implementation\Regression\ConstantRegressionSolution.cs" /> 124 126 <Compile Include="Implementation\Regression\RegressionEnsembleProblemData.cs" /> 125 127 <Compile Include="Implementation\Regression\RegressionEnsembleModel.cs"> … … 127 129 </Compile> 128 130 <Compile Include="Implementation\Regression\RegressionEnsembleSolution.cs" /> 129 <Compile Include="Implementation\TimeSeriesPrognosis\TimeSeriesPrognosisProblem.cs" />130 <Compile Include="Implementation\TimeSeriesPrognosis\TimeSeriesPrognosisProblemData.cs" />131 <Compile Include="Implementation\TimeSeriesPrognosis\TimeSeriesPrognosisSolution.cs" />132 <Compile Include="Implementation\TimeSeriesPrognosis\TimeSeriesPrognosisSolutionBase.cs" />133 131 <Compile Include="Interfaces\Classification\IClassificationEnsembleModel.cs"> 134 132 <SubType>Code</SubType> … … 143 141 <Compile Include="Interfaces\Regression\IRegressionEnsembleSolution.cs" /> 144 142 <Compile Include="Implementation\Regression\RegressionSolutionBase.cs" /> 145 <Compile Include="Interfaces\TimeSeriesPrognosis\IOnlineTimeSeriesCalculator.cs" />146 <Compile Include="Interfaces\TimeSeriesPrognosis\ITimeSeriesPrognosisModel.cs" />147 <Compile Include="Interfaces\TimeSeriesPrognosis\ITimeSeriesPrognosisProblem.cs" />148 <Compile Include="Interfaces\TimeSeriesPrognosis\ITimeSeriesPrognosisProblemData.cs" />149 <Compile Include="Interfaces\TimeSeriesPrognosis\ITimeSeriesPrognosisSolution.cs" />150 143 <Compile Include="OnlineCalculators\NormalizedGiniCalculator.cs" /> 151 <Compile Include="OnlineCalculators\OnlineDirectionalSymmetryCalculator.cs" />152 144 <Compile Include="OnlineCalculators\OnlineMeanAbsoluteErrorCalculator.cs" /> 153 145 <Compile Include="OnlineCalculators\OnlineLinearScalingParameterCalculator.cs" /> … … 185 177 <Compile Include="OnlineCalculators\OnlinePearsonsRSquaredCalculator.cs" /> 186 178 <Compile Include="Implementation\Regression\RegressionSolution.cs" /> 187 <Compile Include="OnlineCalculators\OnlineTheilsUStatisticCalculator.cs" />188 <Compile Include="OnlineCalculators\OnlineWeightedDirectionalSymmetryCalculator.cs" />189 179 <Compile Include="Plugin.cs" /> 190 180 <Compile Include="TableFileParser.cs" /> -
branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleProblemData.cs
r6672 r7215 43 43 44 44 private static readonly ClassificationEnsembleProblemData emptyProblemData; 45 public static ClassificationEnsembleProblemData EmptyProblemData {45 public static new ClassificationEnsembleProblemData EmptyProblemData { 46 46 get { return emptyProblemData; } 47 47 } -
branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblem.cs
r5809 r7215 28 28 [Item("Classification Problem", "A general classification problem.")] 29 29 [Creatable("Problems")] 30 public class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>, IClassificationProblem { 30 public class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>, IClassificationProblem, IStorableContent { 31 public string Filename { get; set; } 32 31 33 [StorableConstructor] 32 34 protected ClassificationProblem(bool deserializing) : base(deserializing) { } -
branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs
r6740 r7215 33 33 [StorableClass] 34 34 [Item("ClassificationProblemData", "Represents an item containing all data defining a classification problem.")] 35 public class ClassificationProblemData : DataAnalysisProblemData, IClassificationProblemData {35 public class ClassificationProblemData : DataAnalysisProblemData, IClassificationProblemData, IStorableContent { 36 36 protected const string TargetVariableParameterName = "TargetVariable"; 37 37 protected const string ClassNamesParameterName = "ClassNames"; … … 39 39 protected const int MaximumNumberOfClasses = 20; 40 40 protected const int InspectedRowsToDetermineTargets = 500; 41 42 public string Filename { get; set; } 41 43 42 44 #region default data -
branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolutionBase.cs
r6961 r7215 77 77 } 78 78 79 [StorableHook(HookType.AfterDeserialization)] 80 private void AfterDeserialization() { 81 if (!this.ContainsKey(TrainingNormalizedGiniCoefficientResultName)) 82 Add(new Result(TrainingNormalizedGiniCoefficientResultName, "Normalized Gini coefficient of the model on the training partition.", new DoubleValue())); 83 if (!this.ContainsKey(TestNormalizedGiniCoefficientResultName)) 84 Add(new Result(TestNormalizedGiniCoefficientResultName, "Normalized Gini coefficient of the model on the test partition.", new DoubleValue())); 85 } 86 79 87 protected void CalculateResults() { 80 88 double[] estimatedTrainingClassValues = EstimatedTrainingClassValues.ToArray(); // cache values -
branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.cs
r6740 r7215 29 29 [StorableClass] 30 30 [Item("ClusteringProblemData", "Represents an item containing all data defining a clustering problem.")] 31 public sealed class ClusteringProblemData : DataAnalysisProblemData, IClusteringProblemData { 31 public sealed class ClusteringProblemData : DataAnalysisProblemData, IClusteringProblemData, IStorableContent { 32 public string Filename { get; set; } 32 33 33 34 #region default data -
branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs
r5809 r7215 28 28 [Item("Regression Problem", "A general regression problem.")] 29 29 [Creatable("Problems")] 30 public class RegressionProblem : DataAnalysisProblem<IRegressionProblemData>, IRegressionProblem { 30 public class RegressionProblem : DataAnalysisProblem<IRegressionProblemData>, IRegressionProblem, IStorableContent { 31 public string Filename { get; set; } 32 31 33 [StorableConstructor] 32 34 protected RegressionProblem(bool deserializing) : base(deserializing) { } -
branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs
r6740 r7215 33 33 [StorableClass] 34 34 [Item("RegressionProblemData", "Represents an item containing all data defining a regression problem.")] 35 public class RegressionProblemData : DataAnalysisProblemData, IRegressionProblemData {35 public class RegressionProblemData : DataAnalysisProblemData, IRegressionProblemData, IStorableContent { 36 36 protected const string TargetVariableParameterName = "TargetVariable"; 37 public string Filename { get; set; } 37 38 38 39 #region default data -
branches/HeuristicLab.Hive.Azure/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/NormalizedGiniCalculator.cs
r6964 r7215 37 37 if (errorState != OnlineCalculatorError.None) return double.NaN; 38 38 39 return oe / (Gini(originalValuesArr, estimatedValuesArr, out errorState));39 return oe / (Gini(originalValuesArr, originalValuesArr, out errorState)); 40 40 } 41 41
Note: See TracChangeset
for help on using the changeset viewer.