aac-metrics 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57db00976963f424efaab981a2b5066280b2de8dd8d3b241301ba3880fe1ce5c
-  data.tar.gz: fc386c30321ad3f94f03b00bfde72c19ea20dfebf400f6cc8322c841c5b5950b
+  metadata.gz: cdca6a6f1a0e5d01566d0e756115a550cbe48ec89ae0bacafb50c33070dbfd00
+  data.tar.gz: a86ccc6326629f57a9be59410d5768c8003141b7157b98e66337e73c98e3ae80
 SHA512:
-  metadata.gz: 4b9778b4e5a1dce3c1571bdd3038025b7ca6acec1dc9359cc4a04c5183dfd6640fd11fc06651d3059a5561f20d5f22974e6fa35c72d6b6273ee326b38c09612b
-  data.tar.gz: a2762f3a27e48b3445495d0ff16e46da23d80bd4d8e4a08f347df957fd3b595bc93f7697c769b92ba61bd633d57ec07b8df83c0bc2a1d374b763e48be9506724
+  metadata.gz: 874df2c0b4f3aeedacd81d278911c3d999a6b305e7c7754b865df3a32ae2546e0b0f7aa8c33517178ea767f12fc3383777e59a7a57d56f2571b18ce0af65034c
+  data.tar.gz: 297b9e01205d0154b98f898fabf5804e541a6617f0177d80e24bd31c1b8e2c81e70d8cf068f44306bc431ff43f6f1b327c267d058a82778065ec48cad652179e

data/lib/aac-metrics/metrics.rb

@@ -252,18 +252,22 @@ module AACMetrics::Metrics
     compare = AACMetrics::Metrics.analyze(compset, false)
     res[:comp_boards] = compare[:total_boards]
     res[:comp_buttons] = compare[:total_buttons]
+    res[:comp_grid] = compare[:grid]
     
     compare_words = []
     compare_buttons = {}
     comp_efforts = {}
+    comp_levels = {}
     compare[:buttons].each do |btn|
       compare_words << btn[:label]
       compare_buttons[btn[:label]] = btn
       comp_efforts[btn[:label]] = btn[:effort]
+      comp_levels[btn[:label]] = btn[:level]
     end
 
     sortable_efforts = {}
     target_efforts = {}
+    target_levels = {}
     target_words = []
     # Track effort scores for each button in the set,
     # used to sort and for assessing priority
@@ -272,6 +276,7 @@ module AACMetrics::Metrics
     res[:buttons].each{|b| 
       target_words << b[:label]
       target_efforts[b[:label]] = b[:effort]
+      target_levels[b[:label]] = b[:level]
       sortable_efforts[b[:label]] = b[:effort] 
       comp = compare_buttons[b[:label]]
       if comp
@@ -414,7 +419,6 @@ module AACMetrics::Metrics
       res[:cores][list['id']] = {name: list['name'], list: list['words'], average_effort: list_effort, comp_effort: comp_effort}
     end
     target_effort_tally = (target_effort_tally / core_lists.to_a.length) * 5.0
-
     comp_effort_tally = (comp_effort_tally / core_lists.to_a.length) * 5.0
 
     # TODO: Assemble or allow a battery of word combinations,
@@ -422,27 +426,41 @@ module AACMetrics::Metrics
     # as well as an average level of effort across combinations.
     res[:sentences] = []
     sentences.each do |words|
-      puts "  #{words.join(' ')}"
-      BOARD_CHANGE_PROCESSING_EFFORT
       target_effort_score = 0.0
       comp_effort_score = 0.0
       words.each_with_index do |word, idx|
         synonym_words = [word] + (synonyms[word] || [])
         effort = target_efforts[word] || target_efforts[word.downcase]
+        level = target_levels[word] || target_levels[word.downcase]
         if !effort
-          synonym_words.each{|w| effort ||= target_efforts[w] }
+          synonym_words.each do |w| 
+            if !effort && target_efforts[w]
+              effort = target_efforts[w]
+              level = target_levels[w]
+            end
+          end
         end
         effort ||= spelling_effort(word)
-        effort += (idx == 0) ? 0.0 : BOARD_CHANGE_PROCESSING_EFFORT
+        if level && level > 0 && idx > 0
+          effort += BOARD_CHANGE_PROCESSING_EFFORT
+        end
         ee = effort
         target_effort_score += effort
 
         effort = comp_efforts[word] || comp_efforts[word.downcase]
+        level = comp_levels[word] || comp_levels[word.downcase]
         if !effort
-          synonym_words.each{|w| effort ||= comp_efforts[w] }
+          synonym_words.each do |w| 
+            if !effort && comp_efforts[w]
+              effort = comp_efforts[w]
+              level = comp_levels[w]
+            end
+          end
         end
         effort ||= spelling_effort(word)
-        effort += (idx == 0) ? 0.0 : BOARD_CHANGE_PROCESSING_EFFORT
+        if level && level > 0 && idx > 0
+          effort += BOARD_CHANGE_PROCESSING_EFFORT
+        end
         comp_effort_score += effort
       end
       target_effort_score = target_effort_score / words.length