Changeset 543 for trunk/sources

Timestamp:

09/10/08 10:29:28 (16 years ago)

Author:

gkronber

Message:

removed prototypical implementation of rdf-like statement store and corresponding operators in a consolidation step (to prepare for a more solid implementation). Ticket #261 (Items are stored multiple times in the result entries in the CEDMA DB)

Location:

trunk/sources

Files:

• HeuristicLab.CEDMA.DB.Interfaces/HeuristicLab.CEDMA.DB.Interfaces.csproj (modified) (1 diff)
• HeuristicLab.CEDMA.DB.Interfaces/IDatabase.cs (modified) (1 diff)
• HeuristicLab.CEDMA.DB.Interfaces/ItemEntry.cs (deleted)
• HeuristicLab.CEDMA.DB/Database.cs (modified) (2 diffs)
• HeuristicLab.CEDMA.Operators/HeuristicLab.CEDMA.Operators.csproj (modified) (1 diff)
• HeuristicLab.CEDMA.Operators/MakeStatement.cs (deleted)
• HeuristicLab.CEDMA.Operators/OntologyExtractor.cs (deleted)
• HeuristicLab.CEDMA.Operators/SubScopesExtractor.cs (deleted)
• HeuristicLab.CEDMA.Operators/VariableExtractor.cs (deleted)
• HeuristicLab.CEDMA.Server/HeuristicLab.CEDMA.Server.csproj (modified) (1 diff)
• HeuristicLab.CEDMA.Server/ServerForm.cs (modified) (1 diff)

trunk/sources/HeuristicLab.CEDMA.DB.Interfaces/HeuristicLab.CEDMA.DB.Interfaces.csproj

@@ -55 +55 @@
   <ItemGroup>
     <Compile Include="AgentEntry.cs" />
-    <Compile Include="ItemEntry.cs" />
     <Compile Include="OperatorEntry.cs" />
     <Compile Include="ProcessStatus.cs" />

trunk/sources/HeuristicLab.CEDMA.DB.Interfaces/IDatabase.cs

@@ -82 +82 @@
     [OperationContract]
     OperatorEntry GetOperator(long id);
-
-    [OperationContract]
-    IList<ItemEntry> GetOntologyItems();
-
-    [OperationContract]
-    IList<ItemEntry> GetItems(Guid predicate, Guid property);
-
-    [OperationContract]
-    void LinkItems(ItemEntry subject, ItemEntry predicate, ItemEntry property);
   }
 }

trunk/sources/HeuristicLab.CEDMA.DB/Database.cs

@@ -66 +66 @@
             using(DbCommand cmd = cnn.CreateCommand()) {
               cmd.CommandText = "CREATE TABLE Operator (ID integer primary key autoincrement, Name text, RawData Blob)";
-              cmd.Transaction = t;
-              cmd.ExecuteNonQuery();
-            }
-            using(DbCommand cmd = cnn.CreateCommand()) {
-              cmd.CommandText = "CREATE TABLE Item (guid GUID primary key, RawData Blob)";
-              cmd.Transaction = t;
-              cmd.ExecuteNonQuery();
-            }
-            using(DbCommand cmd = cnn.CreateCommand()) {
-              cmd.CommandText = "CREATE TABLE Statement (id integer primary key autoincrement, subject GUID, predicate GUID, property GUID, CreationTime DateTime)";
               cmd.Transaction = t;
               cmd.ExecuteNonQuery();
@@ -629 +619 @@
     }
     #endregion
-
-    public IList<ItemEntry> GetOntologyItems() {
-      List<ItemEntry> ontologies = new List<ItemEntry>();
-      List<ItemEntry> items = new List<ItemEntry>();
-      rwLock.EnterReadLock();
-      try {
-        using(DbConnection cnn = new SQLiteConnection(connectionString)) {
-          cnn.Open();
-          using(DbCommand c = cnn.CreateCommand()) {
-            c.CommandText = "Select guid, rawdata from Item,(select subject from Statement where subject=property) where subject=guid";
-            using(DbDataReader r = c.ExecuteReader()) {
-              while(r.Read()) {
-                ItemEntry ontology = new ItemEntry();
-                ontology.Guid = r.GetGuid(0);
-                ontology.RawData = (byte[])r.GetValue(1);
-                ontologies.Add(ontology);
-              }
-            }
-          }
-          foreach(ItemEntry ontology in ontologies) {
-            using(DbCommand c = cnn.CreateCommand()) {
-              c.CommandText = "Select guid, rawdata from Item,(select property from Statement where subject=@ontology) where guid=property";
-              DbParameter ontologyParam = c.CreateParameter();
-              ontologyParam.ParameterName = "@ontology";
-              ontologyParam.Value = ontology.Guid.ToString();
-              c.Parameters.Add(ontologyParam);
-              using(DbDataReader r = c.ExecuteReader()) {
-                while(r.Read()) {
-                  ItemEntry item = new ItemEntry();
-                  item.Guid = r.GetGuid(0);
-                  item.RawData = (byte[])r.GetValue(1);
-                  items.Add(item);
-                }
-              }
-            }
-          }
-        }
-      } finally {
-        rwLock.ExitReadLock();
-      }
-      return items;
-    }
-
-    public IList<ItemEntry> GetItems(Guid predicate, Guid property) {
-      List<ItemEntry> items = new List<ItemEntry>();
-      rwLock.EnterReadLock();
-      try {
-        using(DbConnection cnn = new SQLiteConnection(connectionString)) {
-          cnn.Open();
-          using(DbCommand c = cnn.CreateCommand()) {
-            c.CommandText = "Select guid, rawdata from Item,(select subject from Statement where predicate=@Predicate and property=@Property) where subject=guid";
-            DbParameter predParam = c.CreateParameter();
-            predParam.ParameterName = "@Predicate";
-            predParam.Value = predicate.ToString();
-            c.Parameters.Add(predParam);
-            DbParameter propertyParam = c.CreateParameter();
-            propertyParam.ParameterName = "@Property";
-            propertyParam.Value = property.ToString();
-            c.Parameters.Add(propertyParam);
-            using(DbDataReader r = c.ExecuteReader()) {
-              while(r.Read()) {
-                ItemEntry item = new ItemEntry();
-                item.Guid = r.GetGuid(0);
-                item.RawData = (byte[])r.GetValue(1);
-                items.Add(item);
-              }
-            }
-          }
-        }
-      } finally {
-        rwLock.ExitReadLock();
-      }
-      return items;
-    }
-
-    public void LinkItems(ItemEntry subject, ItemEntry predicate, ItemEntry property) {
-      rwLock.EnterWriteLock();
-      try {
-        using(SQLiteConnection cnn = new SQLiteConnection(connectionString)) {
-          cnn.Open();
-          using(SQLiteTransaction t = cnn.BeginTransaction()) {
-            ItemEntry[] items = new ItemEntry[] { subject, predicate, property };
-            foreach(ItemEntry item in items) {
-              long n = 0;
-              using(SQLiteCommand c = cnn.CreateCommand()) {
-                c.Transaction = t;
-                c.CommandText = "select count(guid) from item where guid=@guid";
-                DbParameter guidParam = c.CreateParameter();
-                guidParam.ParameterName = "@guid";
-                guidParam.Value = item.Guid.ToString();
-                c.Parameters.Add(guidParam);
-                n = (long)c.ExecuteScalar();
-              }
-              if(n == 0) using(SQLiteCommand c = cnn.CreateCommand()) {
-                  c.Transaction = t;
-                  c.CommandText = "insert into item (Guid, RawData) values (@Guid, @RawData)";
-                  DbParameter guidParam = c.CreateParameter();
-                  guidParam.ParameterName = "@Guid";
-                  guidParam.Value = item.Guid.ToString();
-                  c.Parameters.Add(guidParam);
-                  DbParameter rawDataParam = c.CreateParameter();
-                  rawDataParam.ParameterName = "@RawData";
-                  rawDataParam.Value = item.RawData;
-                  c.Parameters.Add(rawDataParam);
-                  c.ExecuteNonQuery();
-                }
-            }
-            using(SQLiteCommand c = cnn.CreateCommand()) {
-              c.Transaction = t;
-              c.CommandText = "insert into Statement (Subject, Predicate, Property, CreationTime) values (@Subject, @Predicate, @Property, @CreationTime)";
-              DbParameter subjectParam = c.CreateParameter();
-              subjectParam.ParameterName = "@Subject";
-              subjectParam.Value = subject.Guid.ToString();
-              c.Parameters.Add(subjectParam);
-              DbParameter predParam = c.CreateParameter();
-              predParam.ParameterName = "@Predicate";
-              predParam.Value = predicate.Guid.ToString();
-              c.Parameters.Add(predParam);
-              DbParameter propertyParam = c.CreateParameter();
-              propertyParam.ParameterName = "@Property";
-              propertyParam.Value = property.Guid.ToString();
-              c.Parameters.Add(propertyParam);
-              DbParameter timeParam = c.CreateParameter();
-              timeParam.ParameterName = "@CreationTime";
-              timeParam.Value = DateTime.Now;
-              c.Parameters.Add(timeParam);
-              c.ExecuteNonQuery();
-            }
-            t.Commit();
-          }
-        }
-      } finally {
-        rwLock.ExitWriteLock();
-      }
-    }
   }
 }

trunk/sources/HeuristicLab.CEDMA.Operators/HeuristicLab.CEDMA.Operators.csproj

@@ -54 +54 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="VariableExtractor.cs" />
-    <Compile Include="SubScopesExtractor.cs" />
-    <Compile Include="OntologyExtractor.cs" />
     <Compile Include="ResultsExtractor.cs" />
-    <Compile Include="MakeStatement.cs" />
     <Compile Include="InjectedVariableExtractor.cs" />
     <Compile Include="SplitScopeToItemsResultWriter.cs" />

trunk/sources/HeuristicLab.CEDMA.Server/HeuristicLab.CEDMA.Server.csproj

@@ -4 +4 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F05D261A-4F7D-46C9-AB9C-21FD4566D719}</ProjectGuid>

trunk/sources/HeuristicLab.CEDMA.Server/ServerForm.cs

@@ -70 +70 @@
         database = new Database(connectionString);
         database.CreateNew();
-        InitDefaultOntology();
       } else {
         database = new Database(connectionString);
-        if(database.GetOntologyItems().Count == 0) InitDefaultOntology();
       }
-    }
-
-    private void InitDefaultOntology() {
-      // init default ontology
-      StringData[] entities = new StringData[] {
-      new StringData("CedmaOntology"),
-      new StringData("definesEntity"),
-      new StringData("class:GpFunctionTree"),
-      new StringData("class:Dataset"),
-      new StringData("instanceOf"),
-      new StringData("hasModel"),
-      new StringData("modelOf"),
-      new StringData("targetVariable"),
-      new StringData("trainingSamplesStart"),
-      new StringData("trainingSamplesEnd"),
-      new StringData("validationSamplesStart"),
-      new StringData("validationSamplesEnd"),
-      new StringData("testSamplesStart"),
-      new StringData("testSamplesEnd"),
-      new StringData("trainingMeanSquaredError"),
-      new StringData("validationMeanSquaredError"),
-      new StringData("testMeanSquaredError"),
-      new StringData("trainingMeanAbsolutePercentageError"),
-      new StringData("validationMeanAbsolutePercentageError"),
-      new StringData("testMeanAbsolutePercentageError"),
-      new StringData("treeSize"),
-      new StringData("treeHeight")
-      };
-      foreach(StringData entity in entities) {
-        LinkItems(entities[0], entities[1], entity);
-      }
-    }
-
-    private void LinkItems(StringData subj, StringData pred, StringData prop) {
-      ItemEntry subjEntry = new ItemEntry();
-      ItemEntry predEntry = new ItemEntry();
-      ItemEntry propEntry = new ItemEntry();
-      subjEntry.Guid = subj.Guid;
-      subjEntry.RawData = PersistenceManager.SaveToGZip(subj);
-      predEntry.Guid = pred.Guid;
-      predEntry.RawData = PersistenceManager.SaveToGZip(pred);
-      propEntry.Guid = prop.Guid;
-      propEntry.RawData = PersistenceManager.SaveToGZip(prop);
-
-      database.LinkItems(subjEntry, predEntry, propEntry);
     }