Changeset 726 for trunk/sources

Timestamp:

11/09/08 19:21:25 (16 years ago)

Author:

cbahner

Message:

#320 changed collections to generics; first persistence mechanism tests

Location:

trunk/sources/HeuristicLab.Visualization

Files:

• ChartDataRowsModel.cs (modified) (3 diffs)
• ChartDataRowsModelColumn.cs (modified) (1 diff)
• ChartDataRowsModelDummy.cs (modified) (1 diff)
• HeuristicLab.Visualization.csproj (modified) (2 diffs)

trunk/sources/HeuristicLab.Visualization/ChartDataRowsModel.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
-using System.Collections.Specialized;
+//using System.Collections.Specialized;
+using System.Xml;
+using System.Xml.Serialization;
+using HeuristicLab.Core;
+using HeuristicLab.Data;
 
 
@@ -9 +15 @@
   public class ChartDataRowsModel : ChartDataModelBase, IChartDataRowsModel {
 
-    private readonly ListDictionary dataRows;
+    private IntData test = new IntData(1);
     
     public ChartDataRowsModel(){
 
-      dataRows = new ListDictionary();
+      columns = new List<ChartDataRowsModelColumn>();
+
+
     }
 
     public void AddDataRow(int id){
-      List<double> row = new List<double>();
 
-      dataRows.Add(id, row);
+      double[] vals = new double[]{};
+
+      ChartDataRowsModelColumn col = new ChartDataRowsModelColumn(id, vals);
+
+      columns.Add(col);
     }
 
     public void PushData(int dataRowId, double value){
-        ((List<double>)dataRows[dataRowId]).Add(value);
 
+      columns[dataRowId].Values[columns[dataRowId].Values.Length+1] = value;
+    }
+
+    public override IView CreateView() {
+      return new IntDataView(test);
     }
 
@@ -35 +50 @@
     }
 
+    private List<ChartDataRowsModelColumn> columns;
+
     public List<ChartDataRowsModelColumn> Columns {
-      get { throw new NotImplementedException(); }
+      get { return columns; }
     }
+
+
+    
+    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
+
+      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+
+      foreach (ChartDataRowsModelColumn column in Columns){
+        XmlNode child = document.CreateNode(XmlNodeType.Element, "column", null);
+        child.InnerText = "xx";
+        node.AppendChild(child);
+      }
+      
+      //node.InnerText = "test1";
+      //test.Data = 11;
+      return node;
+
+    }
+
+
+    /*
+    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+      base.Populate(node, restoredObjects);
+      //Data = bool.Parse(node.InnerText);
+    }
+   */
   }
 }

trunk/sources/HeuristicLab.Visualization/ChartDataRowsModelColumn.cs

@@ -1 +1 @@
 namespace HeuristicLab.Visualization {
   public class ChartDataRowsModelColumn {
-    public readonly int ColumnId;
-    public readonly double[] Values;
+    public  int ColumnId;
+    public  double[] Values;
 
     public ChartDataRowsModelColumn(int columnId, double[] values) {

trunk/sources/HeuristicLab.Visualization/ChartDataRowsModelDummy.cs

@@ -5 +5 @@
 
 namespace HeuristicLab.Visualization {
-  class ChartDataRowsModelDummy : ChartDataRowsModel {
+  public class ChartDataRowsModelDummy : ChartDataRowsModel {
 
+     public ChartDataRowsModelDummy(){
+
+        // test rows
+        AddDataRow(1);
+        AddDataRow(2);
+        AddDataRow(3);
+
+     }
     
   }

trunk/sources/HeuristicLab.Visualization/HeuristicLab.Visualization.csproj

@@ -4 +4 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E392A1E2-DC95-4E33-B82E-8ED690EDA1AB}</ProjectGuid>
@@ -95 +95 @@
       <Name>HeuristicLab.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Data\HeuristicLab.Data.csproj">
+      <Project>{F473D9AF-3F09-4296-9F28-3C65118DAFFA}</Project>
+      <Name>HeuristicLab.Data</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>