Context Navigation

-                      r7678
+                      r7823
     <Compile Include="Implementation\Regression\RegressionSolution.cs" />
     <Compile Include="Plugin.cs" />
-    <Compile Include="TableFileParser.cs" />
     <Compile Include="Implementation\Classification\ThresholdCalculators\AccuracyMaximizationThresholdCalculator.cs" />
     <Compile Include="Implementation\Classification\ThresholdCalculators\NormalDistributionCutPointsThresholdCalculator.cs" />
 …
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
       <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
+      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
+      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     </ProjectReference>
   </ItemGroup>

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblem.cs

r7259	r7823
40	40	ProblemData = new ClassificationProblemData();
41	41	}
42
43		~~public override void ImportProblemDataFromFile(string fileName) {~~
44		~~ClassificationProblemData problemData = ClassificationProblemData.ImportFromFile(fileName);~~
45		~~ProblemData = problemData;~~
46		}
47	42	}
48	43	}

-                      r7266
+                      r7823
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using HeuristicLab.Common;
 …
+    }
     #endregion
-    #region Import from file
-    public static ClassificationProblemData ImportFromFile(string fileName) {
-      TableFileParser csvFileParser = new TableFileParser();
-      csvFileParser.Parse(fileName);
-      Dataset dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);
-      dataset.Name = Path.GetFileName(fileName);
-      ClassificationProblemData problemData = new ClassificationProblemData(dataset, dataset.DoubleVariables.Skip(1), dataset.DoubleVariables.First());
-      problemData.Name = "Data imported from " + Path.GetFileName(fileName);
-      return problemData;
+    }
-    #endregion
+  }
+}

r7259	r7823
38	38	ProblemData = new ClusteringProblemData();
39	39	}
40
41		~~public override void ImportProblemDataFromFile(string fileName) {~~
42		~~ClusteringProblemData problemData = ClusteringProblemData.ImportFromFile(fileName);~~
43		~~ProblemData = problemData;~~
44		}
45	40	}
46	41	}

-                      r7259
+                      r7823
 using System.Collections.Generic;
-using System.IO;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 …
       : base(dataset, allowedInputVariables) {
+    }
-    #region Import from file
-    public static ClusteringProblemData ImportFromFile(string fileName) {
-      TableFileParser csvFileParser = new TableFileParser();
-      csvFileParser.Parse(fileName);
-      Dataset dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);
-      dataset.Name = Path.GetFileName(fileName);
-      ClusteringProblemData problemData = new ClusteringProblemData(dataset, dataset.DoubleVariables);
-      problemData.Name = "Data imported from " + Path.GetFileName(fileName);
-      return problemData;
+    }
-    #endregion
+  }
+}

-                      r7259
+                      r7823
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.Instances;
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableClass]
   public abstract class DataAnalysisProblem<T> : Problem,
     IDataAnalysisProblem<T>
+  public abstract class DataAnalysisProblem<T> : Problem, IDataAnalysisProblem<T>,
+    IProblemInstanceConsumer<T>, IProblemInstanceExporter<T>
     where T : class, IDataAnalysisProblemData {
     private const string ProblemDataParameterName = "ProblemData";
 …
+    }
+    public abstract void ImportProblemDataFromFile(string fileName);
+    #region Import & Export
+    public void Load(T data) {
+      Name = data.Name;
+      Description = data.Description;
+      ProblemData = data;
+      OnReset();
+    }
+    public T Export() {
+      return ProblemData;
+    }
+    #endregion
+  }
+}

r7259	r7823
40	40	ProblemData = new RegressionProblemData();
41	41	}
42
43		~~public override void ImportProblemDataFromFile(string fileName) {~~
44		~~RegressionProblemData problemData = RegressionProblemData.ImportFromFile(fileName);~~
45		~~ProblemData = problemData;~~
46		}
47	42	}
48	43	}

-                      r7259
+                      r7823
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using HeuristicLab.Common;
 …
       OnChanged();
+    }
-    #region Import from file
-    public static RegressionProblemData ImportFromFile(string fileName) {
-      TableFileParser csvFileParser = new TableFileParser();
-      csvFileParser.Parse(fileName);
-      Dataset dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);
-      dataset.Name = Path.GetFileName(fileName);
-      RegressionProblemData problemData = new RegressionProblemData(dataset, dataset.DoubleVariables.Skip(1), dataset.DoubleVariables.First());
-      problemData.Name = "Data imported from " + Path.GetFileName(fileName);
-      return problemData;
+    }
-    #endregion
+  }
+}

r7259	r7823
29	29	IDataAnalysisProblemData ProblemData { get; }
30	30	event EventHandler ProblemDataChanged;
31
32		~~void ImportProblemDataFromFile(string fileName);~~
33	31	}
34	32

r7259	r7823
36	36	[PluginDependency("HeuristicLab.Parameters", "3.3")]
37	37	[PluginDependency("HeuristicLab.Persistence", "3.3")]
	38	[PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
38	39	public class HeuristicLabProblemsDataAnalysisPlugin : PluginBase {
39	40	}

Note: See TracChangeset for help on using the changeset viewer.