openstudio-recommendation-engine 0.1.0 → 0.1.1

data/lib/openstudio/recommendation_engine/recommendation_engine.rb

@@ -30,32 +30,32 @@ module OpenStudio
       def init
         measure_checks = Dir.glob("#{@path_to_measures}/**/recommendation.rb")
        
-        puts "List of measures: #{measure_checks.inspect}"
-        results = []
+        applicable_measures = []
+          
         measure_checks.each do |measure|
           require "#{File.expand_path(measure)}"
 
           measure_class_name = File.basename(File.expand_path("../..",measure))
           puts "measure class name is: #{measure_class_name}"
-          
-          m = measure_class_name.constantize.new
-          puts m.inspect
-          
-          # recommendation engine ?
-          #require "#{a.name}::MeasureApplciblitychere.new()."
+
+          measure = Object.const_get(measure_class_name).new
           
           if @model
-            measure_check = Measure::MeasureApplicabilityChecker.new(@model)
-            measure_check.check_applicability  
+            result = measure.check_applicability(@model)
+            if result
+              applicable_measures << result
+            else
+              puts "measure #{measure_class_name} not applicable"
+            end
           else
             raise "No model passed into the recommendation engine"
           end
           
-          
-          results << measure_check.result
         end
 
-        return results
+        applicable_measures_json = JSON.pretty_generate(applicable_measures)
+        puts applicable_measures_json
+        return applicable_measures_json
 
       end
 

data/lib/openstudio/recommendation_engine/version.rb

@@ -19,6 +19,6 @@
 
 module OpenStudio
   module RecommendationEngine
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/{recommendation_engine.rb → openstudio_recommendation_engine.rb}

@@ -7,11 +7,10 @@ rescue
   $openstudio_loaded = false
 end
 
-require 'active_support/core_ext/string' # for constantize
 require 'parallel'
 require 'openstudio/recommendation_engine/recommendation_engine'
 require 'openstudio/recommendation_engine/version'
 require 'openstudio/helpers/safe_load'
-
+require 'json/pure'
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openstudio-recommendation-engine
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Nicholas Long
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: active_support
+  name: json_pure
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -58,7 +58,7 @@ files:
 - lib/openstudio/helpers/safe_load.rb
 - lib/openstudio/recommendation_engine/recommendation_engine.rb
 - lib/openstudio/recommendation_engine/version.rb
-- lib/recommendation_engine.rb
+- lib/openstudio_recommendation_engine.rb
 homepage: http://openstudio.nrel.gov
 licenses: 
 - LGPL