Changeset 5496 for branches/DataAnalysis Refactoring

Timestamp:

02/16/11 16:30:56 (14 years ago)

Author:

mkommend

Message:

#1418 - Merged DataAnalysis.Regression and Classification into DataAnalysis.

Location:

branches/DataAnalysis Refactoring

Files:

• HeuristicLab 3.3.sln (modified) (4 diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Classification/3.4/Interfaces (deleted)
• HeuristicLab.Problems.DataAnalysis.Regression/3.4/Interaces/IRegressionEvaluator.cs (deleted)
• HeuristicLab.Problems.DataAnalysis.Regression/3.4/Interaces/IRegressionModel.cs (deleted)
• HeuristicLab.Problems.DataAnalysis.Regression/3.4/Interaces/IRegressionProblem.cs (deleted)
• HeuristicLab.Problems.DataAnalysis.Regression/3.4/Interaces/IRegressionProblemData.cs (deleted)
• HeuristicLab.Problems.DataAnalysis.Regression/3.4/Interaces/IRegressionSolution.cs (deleted)
• HeuristicLab.Problems.DataAnalysis.Regression/3.4/Interaces/IRegressionSolutionCreator.cs (deleted)
• HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification (added)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationEvaluator.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Classification/3.4/Interfaces/IClassificationEvaluator.cs)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationModel.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Classification/3.4/Interfaces/IClassificationModel.cs)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationProblem.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Classification/3.4/Interfaces/IClassificationProblem.cs)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationProblemData.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Classification/3.4/Interfaces/IClassificationProblemData.cs)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationSolution.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Classification/3.4/Interfaces/IClassificationSolution.cs)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationSolutionCreator.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Classification/3.4/Interfaces/IClassificationSolutionCreator.cs)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression (added)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionEvaluator.cs (added)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionModel.cs (added)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblem.cs (added)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs (added)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionSolution.cs (added)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionSolutionCreator.cs (added)

branches/DataAnalysis Refactoring/HeuristicLab 3.3.sln

@@ -78 +78 @@
     {6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6} = {6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6}
     {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB} = {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}
-    {BD16E72E-8F62-4293-A014-6E3D450DF091} = {BD16E72E-8F62-4293-A014-6E3D450DF091}
     {0C67A033-F6D9-4237-B3CA-C033A44706BE} = {0C67A033-F6D9-4237-B3CA-C033A44706BE}
     {250ADE34-82FD-4BAE-86D5-985FBE589C4A} = {250ADE34-82FD-4BAE-86D5-985FBE589C4A}
@@ -96 +95 @@
     {2C36CD4F-E5F5-43A4-801A-201EA895FE17} = {2C36CD4F-E5F5-43A4-801A-201EA895FE17}
     {423BD94F-963A-438E-BA45-3BB3D61CD03B} = {423BD94F-963A-438E-BA45-3BB3D61CD03B}
-    {61DCF050-9FDE-4611-B3C0-EE6EF3788A09} = {61DCF050-9FDE-4611-B3C0-EE6EF3788A09}
     {00814351-4AB8-4088-9B99-F62787B89E93} = {00814351-4AB8-4088-9B99-F62787B89E93}
     {3EAF1454-086D-44A2-8509-B1BA24DB1865} = {3EAF1454-086D-44A2-8509-B1BA24DB1865}
@@ -345 +343 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis-3.4", "HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj", "{DF87C13E-A889-46FF-8153-66DCAA8C5674}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Classification-3.4", "HeuristicLab.Problems.DataAnalysis.Classification\3.4\HeuristicLab.Problems.DataAnalysis.Classification-3.4.csproj", "{61DCF050-9FDE-4611-B3C0-EE6EF3788A09}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Regression-3.4", "HeuristicLab.Problems.DataAnalysis.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Regression-3.4.csproj", "{BD16E72E-8F62-4293-A014-6E3D450DF091}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Symbolic-3.4", "HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj", "{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}"
@@ -1547 +1541 @@
     {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x86.ActiveCfg = Release|x86
     {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x86.Build.0 = Release|x86
-    {61DCF050-9FDE-4611-B3C0-EE6EF3788A09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {61DCF050-9FDE-4611-B3C0-EE6EF3788A09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {61DCF050-9FDE-4611-B3C0-EE6EF3788A09}.Debug|x64.ActiveCfg = Debug|x64
-    {61DCF050-9FDE-4611-B3C0-EE6EF3788A09}.Debug|x64.Build.0 = Debug|x64
-    {61DCF050-9FDE-4611-B3C0-EE6EF3788A09}.Debug|x86.ActiveCfg = Debug|x86
-    {61DCF050-9FDE-4611-B3C0-EE6EF3788A09}.Debug|x86.Build.0 = Debug|x86
-    {61DCF050-9FDE-4611-B3C0-EE6EF3788A09}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {61DCF050-9FDE-4611-B3C0-EE6EF3788A09}.Release|Any CPU.Build.0 = Release|Any CPU
-    {61DCF050-9FDE-4611-B3C0-EE6EF3788A09}.Release|x64.ActiveCfg = Release|x64
-    {61DCF050-9FDE-4611-B3C0-EE6EF3788A09}.Release|x64.Build.0 = Release|x64
-    {61DCF050-9FDE-4611-B3C0-EE6EF3788A09}.Release|x86.ActiveCfg = Release|x86
-    {61DCF050-9FDE-4611-B3C0-EE6EF3788A09}.Release|x86.Build.0 = Release|x86
-    {BD16E72E-8F62-4293-A014-6E3D450DF091}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {BD16E72E-8F62-4293-A014-6E3D450DF091}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {BD16E72E-8F62-4293-A014-6E3D450DF091}.Debug|x64.ActiveCfg = Debug|x64
-    {BD16E72E-8F62-4293-A014-6E3D450DF091}.Debug|x64.Build.0 = Debug|x64
-    {BD16E72E-8F62-4293-A014-6E3D450DF091}.Debug|x86.ActiveCfg = Debug|x86
-    {BD16E72E-8F62-4293-A014-6E3D450DF091}.Debug|x86.Build.0 = Debug|x86
-    {BD16E72E-8F62-4293-A014-6E3D450DF091}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {BD16E72E-8F62-4293-A014-6E3D450DF091}.Release|Any CPU.Build.0 = Release|Any CPU
-    {BD16E72E-8F62-4293-A014-6E3D450DF091}.Release|x64.ActiveCfg = Release|x64
-    {BD16E72E-8F62-4293-A014-6E3D450DF091}.Release|x64.Build.0 = Release|x64
-    {BD16E72E-8F62-4293-A014-6E3D450DF091}.Release|x86.ActiveCfg = Release|x86
-    {BD16E72E-8F62-4293-A014-6E3D450DF091}.Release|x86.Build.0 = Release|x86
     {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Debug|Any CPU.Build.0 = Debug|Any CPU

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

@@ -155 +155 @@
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Regression-3.4.csproj">
-      <Project>{BD16E72E-8F62-4293-A014-6E3D450DF091}</Project>
-      <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.4</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
       <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>

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

@@ -109 +109 @@
   <ItemGroup>
     <Compile Include="Dataset.cs" />
+    <Compile Include="Interfaces\Classification\IClassificationEvaluator.cs" />
+    <Compile Include="Interfaces\Classification\IClassificationModel.cs" />
+    <Compile Include="Interfaces\Classification\IClassificationProblem.cs" />
+    <Compile Include="Interfaces\Classification\IClassificationProblemData.cs" />
+    <Compile Include="Interfaces\Classification\IClassificationSolution.cs" />
+    <Compile Include="Interfaces\Classification\IClassificationSolutionCreator.cs" />
     <Compile Include="Interfaces\IDataAnalysisEvaluator.cs" />
     <Compile Include="Interfaces\IDataAnalysisProblemData.cs" />
@@ -114 +120 @@
     <Compile Include="Interfaces\IDataAnalysisSolutionCreator.cs" />
     <Compile Include="Interfaces\IOnlineEvaluator.cs" />
+    <Compile Include="Interfaces\Regression\IRegressionEvaluator.cs" />
+    <Compile Include="Interfaces\Regression\IRegressionModel.cs" />
+    <Compile Include="Interfaces\Regression\IRegressionProblem.cs" />
+    <Compile Include="Interfaces\Regression\IRegressionProblemData.cs" />
+    <Compile Include="Interfaces\Regression\IRegressionSolution.cs" />
+    <Compile Include="Interfaces\Regression\IRegressionSolutionCreator.cs" />
     <Compile Include="OnlineEvaluators\OnlineCovarianceEvaluator.cs" />
     <Compile Include="OnlineEvaluators\OnlineMeanAbsolutePercentageErrorEvaluator.cs" />