Changeset 2000

Timestamp:

06/04/09 15:18:29 (16 years ago)

Author:

gkronber

Message:

Refactoring: changed CEDMA backend to use a single data set per RDF results database. #656 (CEDMA server should handle only one data set (problem) at a time)

Location:

trunk/sources

Files:

• HeuristicLab.CEDMA.Core/3.3/Console.cs (modified) (2 diffs)
• HeuristicLab.CEDMA.Core/3.3/ConsoleEditor.cs (modified) (2 diffs)
• HeuristicLab.CEDMA.Core/3.3/DataSet.cs (modified) (4 diffs)
• HeuristicLab.CEDMA.Core/3.3/DataSetView.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Core/3.3/HeuristicLab.CEDMA.Core-3.3.csproj (modified) (2 diffs)
• HeuristicLab.CEDMA.Core/3.3/Problem.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Core/3.3/ProblemView.cs (modified) (6 diffs)
• HeuristicLab.CEDMA.Core/3.3/Results.cs (modified) (2 diffs)
• HeuristicLab.CEDMA.Server/3.3/DispatcherBase.cs (modified) (3 diffs)
• HeuristicLab.CEDMA.Server/3.3/ExecuterBase.cs (modified) (1 diff)

trunk/sources/HeuristicLab.CEDMA.Core/3.3/Console.cs

@@ -37 +37 @@
     }
 
-    private DataSetList dataSetList;
-    public DataSetList DataSetList {
-      get { return dataSetList; }
+    private DataSet dataSet;
+    public DataSet DataSet {
+      get { return dataSet; }
     }
 
     public Console()
       : base() {
-      dataSetList = new DataSetList();
+      dataSet = new DataSet();
     }
 
@@ -71 +71 @@
 
     internal void Connect(string serverUri) {
-      DataSetList.Store = new StoreProxy(serverUri);
+      IStore store = new StoreProxy(serverUri);
+      var variableBindings = store.Query("?Dataset <" + Ontology.PredicateInstanceOf + "> <" + Ontology.TypeDataSet + "> .", 0, 10).ToArray();
+      if (variableBindings.Length > 0) {
+        dataSet = new DataSet(store, (Entity)variableBindings[0].Get("Dataset"));
+      } else {
+        dataSet.Store = store;
+      }
     }
   }

trunk/sources/HeuristicLab.CEDMA.Core/3.3/ConsoleEditor.cs

@@ -42 +42 @@
       InitializeComponent();
       this.console = console;
-      serverPanel.Enabled = false;
     }
 
@@ -111 +110 @@
         serverPanel.Enabled = true;
         serverPanel.Controls.Clear();
-        Control dataSetListView = (Control)console.DataSetList.CreateView();
-        dataSetListView.Dock = DockStyle.Fill;
-        serverPanel.Controls.Add(dataSetListView);
+        Control dataSetView = (Control)console.DataSet.CreateView();
+        dataSetView.Dock = DockStyle.Fill;
+        serverPanel.Controls.Add(dataSetView);
       } catch(CommunicationException ex) {
         MessageBox.Show("Exception while trying to connect to " + uriTextBox.Text + "\n" + ex.Message);

trunk/sources/HeuristicLab.CEDMA.Core/3.3/DataSet.cs

@@ -61 +61 @@
     }
 
+    private bool activated;
+    public bool Activated {
+      get { return activated; }
+    }
+
     public DataSet()
       : base() {
       guid = Guid.NewGuid();
       name = "Data set";
+      activated = false;
     }
 
@@ -72 +78 @@
       guid = new Guid(dataSetEntity.Uri.Remove(0, Ontology.CedmaNameSpace.Length));
       name = guid.ToString();
+      activated = true;
     }
 
@@ -79 +86 @@
       Store.Add(new Statement(myEntity, Ontology.PredicateSerializedData, new Literal(Convert.ToBase64String(PersistenceManager.SaveToGZip(problem)))));
       Store.Add(new Statement(myEntity, Ontology.PredicateName, new Literal(name)));
+      activated = true;
     }
 
@@ -87 +95 @@
     internal Results GetResults() {
       Results results = new Results(Store);
-      results.FilterDataSet(new Entity(Ontology.CedmaNameSpace + Guid));
       return results;
     }

trunk/sources/HeuristicLab.CEDMA.Core/3.3/DataSetView.cs

@@ -58 +58 @@
       PopulateViewComboBox();
       resultsButton.Enabled = viewComboBox.SelectedItem != null;
+      if (dataSet.Activated) {
+        activateButton.Enabled = false;
+        editorGroupBox.Enabled = false;
+        viewComboBox.Enabled = true;
+        resultsButton.Enabled = true;
+        progressBar.Enabled = true;
+      } else {
+        activateButton.Enabled = true;
+        editorGroupBox.Enabled = true;
+        viewComboBox.Enabled = false;
+        resultsButton.Enabled = false;
+        progressBar.Enabled = false;
+      }
     }
 

trunk/sources/HeuristicLab.CEDMA.Core/3.3/HeuristicLab.CEDMA.Core-3.3.csproj

@@ -103 +103 @@
     <Compile Include="Problem.cs" />
     <Compile Include="DataSet.cs" />
-    <Compile Include="DataSetList.cs" />
-    <Compile Include="DataSetListView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="DataSetListView.Designer.cs">
-      <DependentUpon>DataSetListView.cs</DependentUpon>
-    </Compile>
     <Compile Include="DataSetView.cs">
       <SubType>UserControl</SubType>
@@ -163 +156 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="DataSetListView.resx">
-      <DependentUpon>DataSetListView.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="DataSetView.resx">
       <DependentUpon>DataSetView.cs</DependentUpon>

trunk/sources/HeuristicLab.CEDMA.Core/3.3/Problem.cs

@@ -45 +45 @@
   /// </summary>
   public class Problem : ItemBase {
-    private string name;
-    public string Name {
-      get { return name; }
-    }
     private HeuristicLab.DataAnalysis.Dataset dataset;
-    public HeuristicLab.DataAnalysis.Dataset DataSet {
+    public HeuristicLab.DataAnalysis.Dataset Dataset {
       get { return dataset; }
     }

trunk/sources/HeuristicLab.CEDMA.Core/3.3/ProblemView.cs

@@ -44 +44 @@
     protected override void UpdateControls() {
       base.UpdateControls();
-      datasetView.Dataset = problem.DataSet;
+      datasetView.Dataset = problem.Dataset;
       trainingSamplesStartTextBox.Text = problem.TrainingSamplesStart.ToString();
       trainingSamplesEndTextBox.Text = problem.TrainingSamplesEnd.ToString();
@@ -61 +61 @@
       targetsListBox.Items.Clear();
       inputsListBox.Items.Clear();
-      for (int i = 0; i < problem.DataSet.Columns; i++) {
-        targetsListBox.Items.Add(problem.DataSet.GetVariableName(i), problem.AllowedTargetVariables.Contains(i));
-        inputsListBox.Items.Add(problem.DataSet.GetVariableName(i), problem.AllowedInputVariables.Contains(i));
+      for (int i = 0; i < problem.Dataset.Columns; i++) {
+        targetsListBox.Items.Add(problem.Dataset.GetVariableName(i), problem.AllowedTargetVariables.Contains(i));
+        inputsListBox.Items.Add(problem.Dataset.GetVariableName(i), problem.AllowedInputVariables.Contains(i));
       }
     }
@@ -89 +89 @@
         }
         if (success) {
-          Dataset dataset = (Dataset)problem.DataSet;
+          Dataset dataset = (Dataset)problem.Dataset;
           dataset.Rows = parser.Rows;
           dataset.Columns = parser.Columns;
@@ -98 +98 @@
           dataset.Samples = new double[dataset.Rows * dataset.Columns];
           Array.Copy(parser.Samples, dataset.Samples, dataset.Columns * dataset.Rows);
-          datasetView.Dataset = problem.DataSet;
+          datasetView.Dataset = problem.Dataset;
 
           problem.TrainingSamplesStart = parser.TrainingSamplesStart;
@@ -116 +116 @@
         }
       }
-
     }
 
@@ -146 +145 @@
         int testEnd = int.Parse(testSamplesEndTextBox.Text);
         if (trainingStart < 0 || validationStart < 0 || testStart < 0 ||
-          trainingEnd >= problem.DataSet.Rows || validationEnd >= problem.DataSet.Rows || testEnd >= problem.DataSet.Rows ||
+          trainingEnd >= problem.Dataset.Rows || validationEnd >= problem.Dataset.Rows || testEnd >= problem.Dataset.Rows ||
           trainingStart >= trainingEnd ||
           validationStart >= validationEnd ||

trunk/sources/HeuristicLab.CEDMA.Core/3.3/Results.cs

@@ -68 +68 @@
     private Dictionary<string, Dictionary<object, double>> categoricalValueIndices = new Dictionary<string, Dictionary<object, double>>();
 
-    private Entity dataSetEntity;
-
     public Results(IStore store) {
       this.store = store;
-    }
-
-    internal void FilterDataSet(Entity entity) {
-      this.dataSetEntity = entity;
     }
 
@@ -93 +87 @@
       entries = new List<ResultsEntry>();
       do {
-        var allBindings = store.Query("<" + dataSetEntity + "> <" + Ontology.PredicateHasModel + "> ?Model ." + Environment.NewLine +
+        var allBindings = store.Query("?Dataset <" + Ontology.PredicateHasModel + "> ?Model ." + Environment.NewLine +
           "?Model ?Attribute ?Value .", page, PAGE_SIZE);
         var allModelBindings = allBindings.GroupBy(x => (Entity)x.Get("Model"));

trunk/sources/HeuristicLab.CEDMA.Server/3.3/DispatcherBase.cs

@@ -65 +65 @@
       string targetVariableName = dataSet.Problem.GetVariableName(targetVariable);
 
-
       if (selectedAlgorithm != null) {
         SetProblemParameters(selectedAlgorithm, dataSet.Problem, targetVariable);
@@ -77 +76 @@
 
     private void SetProblemParameters(IAlgorithm algo, Problem problem, int targetVariable) {
-      algo.Dataset = problem.DataSet;
+      algo.Dataset = problem.Dataset;
       algo.TargetVariable = targetVariable;
       algo.ProblemInjector.GetVariable("TrainingSamplesStart").GetValue<IntData>().Data = problem.TrainingSamplesStart;
@@ -94 +93 @@
       } else if (problem.LearningTask == LearningTask.Classification) {
         ItemList<DoubleData> classValues = algo.ProblemInjector.GetVariable("TargetClassValues").GetValue<ItemList<DoubleData>>();
-        foreach (double classValue in GetDifferentClassValues(problem.DataSet, targetVariable)) classValues.Add(new DoubleData(classValue));
+        foreach (double classValue in GetDifferentClassValues(problem.Dataset, targetVariable)) classValues.Add(new DoubleData(classValue));
       }
     }

trunk/sources/HeuristicLab.CEDMA.Server/3.3/ExecuterBase.cs

@@ -71 +71 @@
     protected void StoreResults(IAlgorithm finishedAlgorithm) {
       Entity modelEntity = new Entity(Ontology.CedmaNameSpace + Guid.NewGuid());
-      // TODO (gkronber 27052009)
       // store.Add(new Statement(finishedAlgorithm.DataSetEntity, Ontology.PredicateHasModel, modelEntity));
       StoreModelAttribute(modelEntity, Ontology.TargetVariable, finishedAlgorithm.Model.TargetVariable);