owl-dl fixed for model and prediction datasets

5 files changed, 7 insertions, 7 deletions

diff --git a/fminer.rb b/fminer.rb
index d0ea4f4..79b0d06 100644
--- a/fminer.rb
+++ b/fminer.rb
@@ -23,7 +23,7 @@ get "/fminer/bbrc/?" do
     DC.title => 'fminer backbone refinement class representatives',
     DC.creator => "andreas@maunz.de, helma@in-silico.ch",
     DC.contributor => "vorgrimmlerdavid@gmx.de",
-    OT.isA => OTA.PatternMiningSupervised,
+    RDF.type => [OT.Algorithm,OTA.PatternMiningSupervised],
     OT.parameters => [
     { DC.description => "Dataset URI", OT.paramScope => "mandatory", DC.title => "dataset_uri" },
     { DC.description => "Feature URI for dependent variable", OT.paramScope => "mandatory", DC.title => "prediction_feature" },
@@ -44,7 +44,7 @@ get "/fminer/last/?" do
     DC.title => 'fminer latent structure class representatives',
     DC.creator => "andreas@maunz.de, helma@in-silico.ch",
     DC.contributor => "vorgrimmlerdavid@gmx.de",
-    OT.isA => OTA.PatternMiningSupervised,
+    RDF.type => [OT.Algorithm,OTA.PatternMiningSupervised],
     OT.parameters => [
     { DC.description => "Dataset URI", OT.paramScope => "mandatory", DC.title => "dataset_uri" },
     { DC.description => "Feature URI for dependent variable", OT.paramScope => "mandatory", DC.title => "prediction_feature" },
@@ -195,7 +195,7 @@ post '/fminer/bbrc/?' do
           features << smarts
           metadata = {
             OT.hasSource => url_for('/fminer/bbrc', :full),
-            OT.isA => OT.Substructure,
+            RDF.type => [OT.Feature, OT.Substructure],
             OT.smarts => smarts,
             OT.pValue => p_value.to_f,
             OT.effect => effect,
@@ -343,7 +343,7 @@ post '/fminer/last/?' do
       unless features.include? smarts
         features << smarts
         metadata = {
-          OT.isA => OT.Substructure,
+          RDF.type => [OT.Feature, OT.Substructure],
           OT.hasSource => feature_dataset.uri,
           OT.smarts => smarts,
           OT.pValue => p_value.to_f.abs,
diff --git a/last-utils b/last-utils
-Subproject daafa32e330b27111df6dc7193a6ed72fae2be4
+Subproject 04bd1b73f54bb7422d3c08bb5a81bc02af04f6f
diff --git a/lazar.rb b/lazar.rb
index 67d9f74..a4e006b 100644
--- a/lazar.rb
+++ b/lazar.rb
@@ -141,9 +141,9 @@ post '/lazar/?' do
     lazar.metadata[OT.trainingDataset] = dataset_uri
 		lazar.metadata[OT.featureDataset] = feature_dataset_uri
     if training_activities.feature_type.to_s == "classification"
-      lazar.metadata[OT.isA] = OTA.ClassificationLazySingleTarget
+      lazar.metadata[RDF.type] = [OT.Model, OTA.ClassificationLazySingleTarget]
     elsif training_activities.feature_type.to_s == "regression"
-      lazar.metadata[OT.isA] = OTA.RegressionLazySingleTarget
+      lazar.metadata[RDF.type] = [OT.Model, OTA.RegressionLazySingleTarget]
     end
 
     lazar.metadata[OT.parameters] = [
diff --git a/libfminer b/libfminer
-Subproject 01b8e50e8e6fb3ce29fc8bf0a65a8c6f6af94b3
+Subproject 6514520638b8309ec9bf379bce54f45d3a53419
diff --git a/openbabel.rb b/openbabel.rb
index 3a873c0..1644455 100644
--- a/openbabel.rb
+++ b/openbabel.rb
@@ -44,7 +44,7 @@ get '/openbabel/:property' do
       DC.title => params[:property],
       DC.creator => "helma@in-silico.ch",
       DC.description => description,
-      OT.isA => OTA.DescriptorCalculation,
+      RDF.type => [OTA.DescriptorCalculation],
     }
     response['Content-Type'] = 'application/rdf+xml'
     algorithm.to_rdfxml