Context Navigation

Changeset 5623

Timestamp:

03/07/11 18:07:25 (14 years ago)

Author:

mkommend

Message:

#1418: Added possibility to import data from csv files.

Location:

branches/DataAnalysis Refactoring

Files:

-                      r5618
+                      r5623
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Data;
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
 …
     public SymbolicClassificationMultiObjectiveProblem()
       : base(new ClassificationProblemData(), new SymbolicClassificationMultiObjectiveMeanSquaredErrorTreeSizeEvaluator(), new SymbolicDataAnalysisExpressionTreeCreator()) {
         Maximization = new BoolArray(new bool[] { false, false });
+      Maximization = new BoolArray(new bool[] { false, false });
       MaximumSymbolicExpressionTreeDepth.Value = 8;
       MaximumSymbolicExpressionTreeLength.Value = 25;
 …
+      }
+    }
+    public override void ImportProblemDataFromFile(string fileName) {
+      ClassificationProblemData problemData = ClassificationProblemData.ImportFromFile(fileName);
+      ProblemData = problemData;
+    }
+  }
+}

r5618	r5623
51	51	}
52	52	}
	53
	54	public override void ImportProblemDataFromFile(string fileName) {
	55	ClassificationProblemData problemData = ClassificationProblemData.ImportFromFile(fileName);
	56	ProblemData = problemData;
	57	}
53	58	}
54	59	}

r5618	r5623
54	54	}
55	55	}
	56
	57	public override void ImportProblemDataFromFile(string fileName) {
	58	RegressionProblemData problemData = RegressionProblemData.ImportFromFile(fileName);
	59	ProblemData = problemData;
	60	}
56	61	}
57	62	}

r5618	r5623
53	53	}
54	54	}
	55
	56	public override void ImportProblemDataFromFile(string fileName) {
	57	RegressionProblemData problemData = RegressionProblemData.ImportFromFile(fileName);
	58	ProblemData = problemData;
	59	}
55	60	}
56	61	}

r5618	r5623
270	270	}
271	271	}
	272
	273	public abstract void ImportProblemDataFromFile(string fileName);
272	274	}
273	275	}

-                      r5600
+                      r5623
     <None Include="HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.frame" />
+    <Compile Include="DataAnalysisProblemView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="DataAnalysisProblemView.Designer.cs">
+      <DependentUpon>DataAnalysisProblemView.cs</DependentUpon>
+    </Compile>
     <Compile Include="HeuristicLabProblemsDataAnalysisViewsPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
 …
       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
       <Name>HeuristicLab.MainForm-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
+      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
+      <Name>HeuristicLab.Optimization.Views-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
+      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
+      <Name>HeuristicLab.Optimization-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj">

r5600	r5623
37	37	[PluginDependency("HeuristicLab.MainForm", "3.3.3.0")]
38	38	[PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3.3.0")]
	39	[PluginDependency("HeuristicLab.Optimization","3.3.3.0")]
	40	[PluginDependency("HeuristicLab.Optimization.Views","3.3.3.0")]
39	41	[PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4.0.0")]
40	42	[PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]

r5579	r5623
38	38	ProblemData = new ClassificationProblemData();
39	39	}
	40
	41	public override void ImportProblemDataFromFile(string fileName) {
	42	ClassificationProblemData problemData = ClassificationProblemData.ImportFromFile(fileName);
	43	ProblemData = problemData;
	44	}
40	45	}
41	46	}

r5601	r5623
74	74	if (handler != null) handler(this, EventArgs.Empty);
75	75	}
	76
	77	public abstract void ImportProblemDataFromFile(string fileName);
76	78	}
77	79	}

r5618	r5623
27	27	IParameter ProblemDataParameter { get; }
28	28	IDataAnalysisProblemData ProblemData { get; }
	29
	30	void ImportProblemDataFromFile(string fileName);
29	31	}
30	32

r5579	r5623
38	38	ProblemData = new RegressionProblemData();
39	39	}
	40
	41	public override void ImportProblemDataFromFile(string fileName) {
	42	RegressionProblemData problemData = RegressionProblemData.ImportFromFile(fileName);
	43	ProblemData = problemData;
	44	}
40	45	}
41	46	}

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