Changeset 1075 for branches/CEDMA-Refactoring-Ticket419

Timestamp:

01/07/09 00:38:54 (16 years ago)

Author:

gkronber

Message:

worked on presentation layer for CEDMA #419

Location:

branches/CEDMA-Refactoring-Ticket419

Files:

• HeuristicLab.CEDMA.Charting/HeuristicLab.CEDMA.Charting.csproj (modified) (2 diffs)
• HeuristicLab.CEDMA.Core/DataSetView.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Core/HeuristicLab.CEDMA.Core.csproj (modified) (3 diffs)
• HeuristicLab.CEDMA.Core/Results.cs (moved) (moved from branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/ResultList.cs) (4 diffs)
• HeuristicLab.CEDMA.Core/ResultsView.Designer.cs (moved) (moved from branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/ResultListView.Designer.cs) (1 diff)
• HeuristicLab.CEDMA.Core/ResultsView.cs (moved) (moved from branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/ResultListView.cs) (2 diffs)
• HeuristicLab.CEDMA.Core/ResultsView.resx (moved) (moved from branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/ResultListView.resx)

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Charting/HeuristicLab.CEDMA.Charting.csproj

@@ -86 +86 @@
       <DependentUpon>ModelView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Record.cs" />
     <Compile Include="HeuristicLabCedmaChartingPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ResultList.cs" />
-    <Compile Include="ResultListView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ResultListView.Designer.cs">
-      <DependentUpon>ResultListView.cs</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -156 +148 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="ResultListView.resx">
-      <DependentUpon>ResultListView.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/DataSetView.cs

@@ -64 +64 @@
     private void resultsButton_Click(object sender, EventArgs e) {
       Results results = dataSet.GetResults();
-      Control resultsControl = (Control)results.CreateView();
+      IControl resultsControl = (IControl)results.CreateView();
       PluginManager.ControlManager.ShowControl(resultsControl);
     }

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/HeuristicLab.CEDMA.Core.csproj

@@ -76 +76 @@
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Interfaces\ICedmaAlgorithm.cs" />
-    <Compile Include="Interfaces\ITimeSeriesAlgorithm.cs" />
-    <Compile Include="Interfaces\IClassificationAlgorithm.cs" />
-    <Compile Include="Interfaces\IRegressionAlgorithm.cs" />
     <Compile Include="Problem.cs" />
     <Compile Include="DataSet.cs" />
@@ -104 +100 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ProblemInjector.cs" />
+    <Compile Include="Results.cs" />
+    <Compile Include="ResultsView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ResultsView.Designer.cs">
+      <DependentUpon>ResultsView.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -152 +155 @@
       <DependentUpon>ProblemView.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="ResultsView.resx">
+      <DependentUpon>ResultsView.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/Results.cs

@@ -36 +36 @@
 
 namespace HeuristicLab.CEDMA.Core {
-  public class ResultList : IViewable {
+  public class Results : IViewable, IEnumerable<Record> {
     private Dictionary<Record, Dataset> datasets;
 
@@ -44 +44 @@
       set {
         store = value;
-        Action reloadList = ReloadList;
-        reloadList.BeginInvoke(null, null);
       }
     }
 
-    private List<string> variableNames = new List<string>() { Record.TARGET_VARIABLE, Record.TREE_SIZE, Record.TREE_HEIGHT, Record.SELECTIONPRESSURE,
-    Record.MAPE_TRAINING, Record.MAPE_VALIDATION, Record.MAPE_TEST,
-    Record.R2_TRAINING, Record.R2_VALIDATION, Record.R2_TEST};
-    public string[] VariableNames {
-      get {
-        return variableNames.ToArray();
-      }
-    }
-
-    private Dictionary<Entity, string> predicateToVariableName;
-
-    public event EventHandler<RecordAddedEventArgs> OnRecordAdded;
-
-    private List<Record> records;
-    public List<Record> Records {
-      get {
-        List<Record> result = new List<Record>();
-        lock(records) {
-          result.AddRange(records);
-        }
-        return result;
-      }
-    }
     private void ReloadList() {
       var results = store.Select(new Statement(Ontology.AnyEntity, Ontology.PredicateInstanceOf, Ontology.TypeGeneticProgrammingFunctionTree))
@@ -105 +80 @@
     }
 
-    private void FireRecordAdded(Record r) {
-      if(OnRecordAdded != null) OnRecordAdded(this, new RecordAddedEventArgs(r));
-    }
-
-    public ResultList()
+    public Results(IStore store)
       : base() {
+      this.store = store;
       records = new List<Record>();
       datasets = new Dictionary<Record, Dataset>();
@@ -127 +99 @@
 
     public override IView CreateView() {
-      return new ResultListView(this);
+      return new ResultsView(this);
     }
 
-    internal void OpenModel(Record record) {
-      IList<Statement> modelResults = store.Select(new Statement(new Entity(record.Uri), Ontology.PredicateSerializedData, Ontology.AnyEntity));
-      if(modelResults.Count == 1) {
-        string rawData = ((SerializedLiteral)modelResults[0].Property).RawData;
-        XmlDocument doc = new XmlDocument();
-        doc.LoadXml(rawData);
-        IFunctionTree tree = (IFunctionTree)PersistenceManager.Restore(doc.ChildNodes[1], new Dictionary<Guid, IStorable>());
-        int targetVariable = (int)record.Get(Record.TARGET_VARIABLE);
-        Dataset dataset = GetDataset(record);
+    //internal void OpenModel(Record record) {
+    //  IList<Statement> modelResults = store.Select(new Statement(new Entity(record.Uri), Ontology.PredicateSerializedData, Ontology.AnyEntity));
+    //  if(modelResults.Count == 1) {
+    //    string rawData = ((SerializedLiteral)modelResults[0].Property).RawData;
+    //    XmlDocument doc = new XmlDocument();
+    //    doc.LoadXml(rawData);
+    //    IFunctionTree tree = (IFunctionTree)PersistenceManager.Restore(doc.ChildNodes[1], new Dictionary<Guid, IStorable>());
+    //    int targetVariable = (int)record.Get(Record.TARGET_VARIABLE);
+    //    Dataset dataset = GetDataset(record);
 
-        ModelView modelView = new ModelView(record, dataset, tree, targetVariable);
-        PluginManager.ControlManager.ShowControl(modelView);
-      }
+    //    ModelView modelView = new ModelView(record, dataset, tree, targetVariable);
+    //    PluginManager.ControlManager.ShowControl(modelView);
+    //  }
+    //}
+
+    //private Dataset GetDataset(Record record) {
+    //  if(!datasets.ContainsKey(record)) {
+    //    IList<Statement> result = store.Select(new Statement(Ontology.AnyEntity, Ontology.PredicateHasModel, new Entity(record.Uri)));
+    //    if(result.Count == 1) {
+    //      IList<Statement> datasetResult = store.Select(new Statement(result[0].Subject, Ontology.PredicateSerializedData, Ontology.AnyEntity));
+    //      if(datasetResult.Count == 1) {
+    //        string rawData = ((SerializedLiteral)datasetResult[0].Property).RawData;
+    //        XmlDocument doc = new XmlDocument();
+    //        doc.LoadXml(rawData);
+    //        Dataset dataset = (Dataset)PersistenceManager.Restore(doc.ChildNodes[1], new Dictionary<Guid, IStorable>());
+    //        datasets.Add(record, dataset);
+    //      }
+    //    }
+    //  }
+    //  return datasets[record];
+    //}
+
+    //internal void OpenAlgorithm(Record record) {
+    //  IList<Statement> generatedBy = store.Select(new Statement(new Entity(record.Uri), Ontology.PredicateGeneratedBy, Ontology.AnyEntity));
+    //  if(generatedBy.Count == 1) {
+    //    IList<Statement> algoResult = store.Select(new Statement((Entity)generatedBy[0].Property, Ontology.PredicateSerializedData, Ontology.AnyEntity));
+    //    if(algoResult.Count == 1) {
+    //      string rawData = ((SerializedLiteral)algoResult[0].Property).RawData;
+    //      XmlDocument doc = new XmlDocument();
+    //      doc.LoadXml(rawData);
+    //      IItem algo = (IItem)PersistenceManager.Restore(doc.ChildNodes[1], new Dictionary<Guid, IStorable>());
+    //      PluginManager.ControlManager.ShowControl(algo.CreateView());
+    //    }
+    //  }
+    //}
+
+    internal void FilterDataSet(Entity entity) {
+
     }
 
-    private Dataset GetDataset(Record record) {
-      if(!datasets.ContainsKey(record)) {
-        IList<Statement> result = store.Select(new Statement(Ontology.AnyEntity, Ontology.PredicateHasModel, new Entity(record.Uri)));
-        if(result.Count == 1) {
-          IList<Statement> datasetResult = store.Select(new Statement(result[0].Subject, Ontology.PredicateSerializedData, Ontology.AnyEntity));
-          if(datasetResult.Count == 1) {
-            string rawData = ((SerializedLiteral)datasetResult[0].Property).RawData;
-            XmlDocument doc = new XmlDocument();
-            doc.LoadXml(rawData);
-            Dataset dataset = (Dataset)PersistenceManager.Restore(doc.ChildNodes[1], new Dictionary<Guid, IStorable>());
-            datasets.Add(record, dataset);
-          }
-        }
-      }
-      return datasets[record];
+    #region IEnumerable<Record> Members
+
+    public IEnumerator<Record> GetEnumerator() {
+      throw new NotImplementedException();
     }
 
-    internal void OpenAlgorithm(Record record) {
-      IList<Statement> generatedBy = store.Select(new Statement(new Entity(record.Uri), Ontology.PredicateGeneratedBy, Ontology.AnyEntity));
-      if(generatedBy.Count == 1) {
-        IList<Statement> algoResult = store.Select(new Statement((Entity)generatedBy[0].Property, Ontology.PredicateSerializedData, Ontology.AnyEntity));
-        if(algoResult.Count == 1) {
-          string rawData = ((SerializedLiteral)algoResult[0].Property).RawData;
-          XmlDocument doc = new XmlDocument();
-          doc.LoadXml(rawData);
-          IItem algo = (IItem)PersistenceManager.Restore(doc.ChildNodes[1], new Dictionary<Guid, IStorable>());
-          PluginManager.ControlManager.ShowControl(algo.CreateView());
-        }
-      }
+    #endregion
+
+    #region IEnumerable Members
+
+    IEnumerator IEnumerable.GetEnumerator() {
+      return this.GetEnumerator();
     }
+
+    #endregion
   }
 }

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/ResultsView.Designer.cs

@@ -1 +1 @@
 namespace HeuristicLab.CEDMA.Core {
-  partial class ResultListView {
+  partial class ResultsView {
     /// <summary> 
     /// Required designer variable.

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/ResultsView.cs

@@ -8 +8 @@
 using System.Windows.Forms;
 using HeuristicLab.Core;
+using HeuristicLab.CEDMA.Charting;
 
 namespace HeuristicLab.CEDMA.Core {
-  public partial class ResultListView : ViewBase {
-    private ResultList results;
+  public partial class ResultsView : ViewBase {
+    private Results results;
     private const string FREQUENCY = "<Frequency>";
     private const string CONSTANT_SIZE = "<constant>";
@@ -18 +19 @@
     private Label pleaseSelectAxisLabel = new Label();
 
-    public ResultListView(ResultList results) {
+    public ResultsView(Results results) {
       this.results = results;
       InitializeComponent();