aac-metrics 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 554fc52ede0b5dffdcf9315ec279a9f42a3ef2a44a324195018eda56538336b1
-  data.tar.gz: 2b082df38edf52ddf495045969db894ef02f7718641658d8d1ca4b012456e14c
+  metadata.gz: 62c96e82e12b2a0c9eb03ad38b65af63c348731faf58ac3920de4d87c77e2d1c
+  data.tar.gz: 16c049e5e33c1b18cdb374afbf9117299fd47bddc91c15042284f2f41f96dc6b
 SHA512:
-  metadata.gz: 58c3c7e8128b0bee8754baa3b218a36491cf985ed752b917733a0508bc9a4c8abe8c3e2c40ddcb7cd9098bea51a6c3d9143f5ba4cbd2d9098f59f16899bf1e0b
-  data.tar.gz: c9e2ec540feee357aaf6b1a20b11e5b938d2f4f8d28ba6d03eee80245167b1eb339ab5a2e1440588db6a31cffbe27bee37a44d6ef35f0078f5381d363c06226c
+  metadata.gz: c37bef0e90cbea57f8e0d860e2751c1508028b97b9c76e669c6a9f33d5921dc7cf34ea819249c744c7e30a0e08aa9ebb9e9c4bc19fbacc85e56f1ebd7121a9df
+  data.tar.gz: bf47f7d0bbe809195ad6576269532e0ed4b26cae918ae605b671e6c562fcfdf1e5fba892bd7e0c936a18082b8a9c291c0bfec75a44eb9b9ec3f320e1bec1e52f

data/lib/aac-metrics/loader.rb

@@ -391,9 +391,18 @@ module AACMetrics::Loader
       end
     end
     all_words.uniq!
-    @@synonyms[locale] = all_words
+    @@fringe_words[locale] = all_words
   end
-  
+
+  def self.common_fringe_words(locale)
+    @@common_fringe_words ||= {}
+    return @@common_fringe_words[locale] if @@common_fringe_words[locale]
+    common = self.common_words(locale)['words']
+    core = self.core_lists('en').map{|r| r['words'] }.flatten.compact.uniq
+    all_words = common - core
+    @@common_fringe_words[locale] = all_words
+  end
+
   def self.base_words(locale)
     @@base_words ||= {}
     return @@base_words[locale] if @@base_words[locale]

data/lib/aac-metrics/metrics.rb

@@ -1,14 +1,14 @@
 # TODO:
 # Qualitative evaluation criteria:
-# - this set is easy to learn for communicators
-# - this set is easy to learn for supporters
-# - the vocabulary organization of this set makes sense
-# - this set provides clear opportunities for user-specific words to be added
-# - grammatical forms, growth over time
-# - works well for age group X, Y, Z
-# - works well for a beginning communicator
-# - allows long-term growth as-is
-# - comprehensive core
+# - this set looks easy to learn for communicators
+# - this set looks easy to learn for supporters
+# - this vocabulary organization of this set makes sense
+# - this set provides clear locations for user-specific words to be added
+# - this set supports the use of grammatical forms (tenses and other inflections)
+# - this set provides predefined simplification for beginning communicators
+# - this set allows for long-term vocabulary growth over time
+# - this vocabulary looks like it will work well for young users
+# - this vocabulary looks like it will work well for adult users
 
 # Effort algorithms for scanning/eyes
 module AACMetrics::Metrics
@@ -54,6 +54,7 @@ module AACMetrics::Metrics
       visited_board_ids = {}
       to_visit = [{board: obfset[0], level: 0, entry_x: 1.0, entry_y: 1.0}]
       set_refs = {}
+      cell_refs = {}
       rows_tally = 0.0
       cols_tally = 0.0
       root_rows = nil
@@ -73,6 +74,13 @@ module AACMetrics::Metrics
             set_refs[id] += 1
           end
         end
+        board['grid']['rows'].times do |row_idx|
+          board['grid']['columns'].times do |col_idx|
+            id = (board['grid']['order'][row_idx] || [])[col_idx]
+            cell_refs["#{row_idx}.#{col_idx}"] ||= 0.0
+            cell_refs["#{row_idx}.#{col_idx}"] += id ? 1.0 : 0.25
+          end
+        end
         if board['semantic_ids']
           board['semantic_ids'].each do |id|
             set_refs[id] ||= 0
@@ -88,7 +96,8 @@ module AACMetrics::Metrics
       end
       set_pcts = {}
       set_refs.each do |id, cnt|
-        set_pcts[id] = cnt.to_f / obfset.length.to_f
+        loc = id.split(/-/)[1]
+        set_pcts[id] = cnt.to_f / (cell_refs[loc] || obfset.length).to_f
       end
       locale = obfset[0]['locale']
       known_buttons = {}
@@ -407,6 +416,7 @@ module AACMetrics::Metrics
     synonyms = AACMetrics::Loader.synonyms(target[:locale])
     sentences = AACMetrics::Loader.sentences(target[:locale])
     fringe = AACMetrics::Loader.fringe_words(target[:locale])
+    common_fringe = AACMetrics::Loader.common_fringe_words(target[:locale])
     common_words_obj['efforts'].each{|w, e| sortable_efforts[w] ||= e }
     common_words = common_words_obj['words']
     
@@ -600,8 +610,31 @@ module AACMetrics::Metrics
     target_effort_tally += res[:fringe_words].map{|s| s[:effort] }.sum.to_f / res[:fringe_words].length.to_f * 2.0
     comp_effort_tally += res[:fringe_words].map{|s| s[:comp_effort] }.sum.to_f / res[:fringe_words].length.to_f * 2.0
 
-    target_effort_tally += 80 # placeholder value for future added calculations
-    comp_effort_tally += 80
+    res[:common_fringe_words] = []
+    common_fringe.each do |word|
+      target_effort_score = 0.0
+      comp_effort_score = 0.0
+      synonym_words = [word] + (synonyms[word] || [])
+      effort = target_efforts[word] || target_efforts[word.downcase]
+      if !effort
+        synonym_words.each{|w| effort ||= target_efforts[w] }
+      end
+      effort ||= spelling_effort(word)
+      target_effort_score += effort
+
+      effort = comp_efforts[word] || comp_efforts[word.downcase]
+      if !effort
+        synonym_words.each{|w| effort ||= comp_efforts[w] }
+      end
+      effort ||= spelling_effort(word)
+      comp_effort_score += effort
+      res[:common_fringe_words] << {word: word, effort: target_effort_score, comp_effort: comp_effort_score}
+    end
+    target_effort_tally += res[:common_fringe_words].map{|s| s[:effort] }.sum.to_f / res[:common_fringe_words].length.to_f * 1.0
+    comp_effort_tally += res[:common_fringe_words].map{|s| s[:comp_effort] }.sum.to_f / res[:common_fringe_words].length.to_f * 1.0
+
+    target_effort_tally += 70 # placeholder value for future added calculations
+    comp_effort_tally += 70