1 files changed, 11 insertions, 10 deletions

diff --git a/validation/validation_format.rb b/validation/validation_format.rb
index f69ceac..6fdea61 100755
--- a/validation/validation_format.rb
+++ b/validation/validation_format.rb
@@ -4,15 +4,15 @@ require "lib/format_util.rb"
 module Validation
   
   # adding to_yaml and to_rdf functionality to validation
-  class Validation < Lib::Validation
+  class Validation
   
     # builds hash for valiation, as the internal presentation differs from the owl-object
     # the hash is directly printed in to_yaml, or added to the owl-structure
     def get_content_as_hash()
       
       h = {}
-      (Lib::VAL_PROPS - [:validation_uri]).each do |p|
-         h[p] = self.send(p)
+      (VAL_PROPS - [:validation_uri]).each do |p|
+         h[p] = self.send(p.to_s)
       end
       if crossvalidation_id!=nil
         cv = {:type => OT.CrossvalidationInfo}
@@ -22,13 +22,14 @@ module Validation
         h[:crossvalidation_info] = cv
       end
       if classification_statistics 
-        raise "classification_statistics is no has: "+classification_statistics.class.to_s unless classification_statistics.is_a?(Hash)
+        raise "classification_statistics is no hash: "+classification_statistics.class.to_s+" -> '"+
+          classification_statistics.to_s+"'" unless classification_statistics.is_a?(Hash)
         clazz = { :type => OT.ClassificationStatistics }
-        Lib::VAL_CLASS_PROPS_SINGLE.each{ |p| clazz[p] = classification_statistics[p] }
+        VAL_CLASS_PROPS_SINGLE.each{ |p| clazz[p] = classification_statistics[p] }
         
         # transpose results per class
         class_values = {}
-        Lib::VAL_CLASS_PROPS_PER_CLASS.each do |p|
+        VAL_CLASS_PROPS_PER_CLASS.each do |p|
           raise "missing classification statitstics: "+p.to_s+" "+classification_statistics.inspect if classification_statistics[p]==nil
           classification_statistics[p].each do |class_value, property_value|
             class_values[class_value] = {:class_value => class_value, :type => OT.ClassValueStatistics} unless class_values.has_key?(class_value)
@@ -54,7 +55,7 @@ module Validation
         h[:classification_statistics] = clazz
       elsif regression_statistics
         regr = {:type => OT.RegressionStatistics }
-        Lib::VAL_REGR_PROPS.each{ |p| regr[p] = regression_statistics[p]}
+        VAL_REGR_PROPS.each{ |p| regr[p] = regression_statistics[p]}
         h[:regression_statistics] = regr
       end
       return h  
@@ -72,17 +73,17 @@ module Validation
     
   end
     
-  class Crossvalidation < Lib::Crossvalidation
+  class Crossvalidation
   
     def get_content_as_hash
       h = {}
       
-      (Lib::CROSS_VAL_PROPS_REDUNDANT - [:crossvalidation_uri]).each do |p|
+      (CROSS_VAL_PROPS_REDUNDANT - [:crossvalidation_uri]).each do |p|
         h[p] = self.send(p)
       end
       v = []
       #Validation.find( :all, :conditions => { :crossvalidation_id => self.id } ).each do |val|
-      Validation.all( :crossvalidation_id => self.id ).each do |val|
+      Validation.find( :crossvalidation_id => self.id ).each do |val|
         v.push( val.validation_uri.to_s )
       end
       h[:validation_uris] = v