plotting stuff, redis ready check

4 files changed, 31 insertions, 2 deletions

diff --git a/report/plot_factory.rb b/report/plot_factory.rb
index a2be092..093e96a 100644
--- a/report/plot_factory.rb
+++ b/report/plot_factory.rb
@@ -123,8 +123,9 @@ module Reports
         Reports::r_util.double_hist_plot(out_files, train, test, numerical, numerical, "Training Data", "Test Data",
           "Prediction Feature Distribution", validation_set.validations.first.prediction_feature )
       else
+        binary = validation_set.validations[0].bbrc_training_features
         Reports::r_util.feature_value_plot(out_files, validation_set.validations[0].training_feature_dataset_uri,
-          validation_set.validations[0].test_feature_dataset_uri, "Training Data", "Test Data",
+          validation_set.validations[0].test_feature_dataset_uri, "Training Data", "Test Data", (binary ? "binary" : "numerical"),
           validation_set.validations[0].prediction_feature, validation_set.validations[0].subjectid, waiting_task )
       end
     end
diff --git a/report/validation_access.rb b/report/validation_access.rb
index 463337b..0abd22c 100755
--- a/report/validation_access.rb
+++ b/report/validation_access.rb
@@ -239,6 +239,14 @@ class Reports::ValidationDB
     #get_model(validation).classification?
   end
   
+  def bbrc_training_features( validation, subjectid=nil )
+    training_features = Lib::DatasetCache.find( training_feature_dataset_uri(validation,subjectid), subjectid )
+    training_features.features.keys.each do |f|
+      return true if f =~ /bbrc/
+    end
+    false
+  end
+  
   def predicted_variable(validation, subjectid=nil)
     raise "cannot derive model depended props for merged validations" if Lib::MergeObjects.merged?(validation)
     raise "multiple models in this validation, cannot get one predicted variable (#{validation.model_uri})" if validation.model_uri.include?(";")
diff --git a/report/validation_data.rb b/report/validation_data.rb
index 95636fc..15655d7 100755
--- a/report/validation_data.rb
+++ b/report/validation_data.rb
@@ -111,6 +111,14 @@ module Reports
       @training_feature_dataset
     end
     
+    def bbrc_training_features
+      if @bbrc_training_features==nil
+        @bbrc_training_features = Reports.validation_access.bbrc_training_features( self, @subjectid )
+      end
+      @bbrc_training_features
+    end
+    
+    
     #hack this does create the features for the test dataset
     def test_feature_dataset_uri
       unless @test_feature_dataset
diff --git a/validation/validation_application.rb b/validation/validation_application.rb
index 157090e..31ca44c 100755
--- a/validation/validation_application.rb
+++ b/validation/validation_application.rb
@@ -14,6 +14,16 @@ helpers do
   end
 end
 
+get '/redis_ready' do
+  content_type "text/html"
+  begin
+    Validation::Validation.all.size
+    "true" 
+  rescue
+    "false"
+  end
+end
+
 get '/crossvalidation/?' do
   LOGGER.debug "list all crossvalidations "+params.inspect
   model_uri = params.delete("model") || params.delete("model_uri")
@@ -843,4 +853,6 @@ delete '/:id' do
   raise OpenTox::NotFoundError.new "Validation '#{params[:id]}' not found." unless validation
   content_type "text/plain"
   validation.delete_validation
-end
\ No newline at end of file
+end
+
+