aac-metrics 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cfa37f885dec40c12ac7cbb86c44ac49ceec1138866b3de2e52b84facdddb87
-  data.tar.gz: e29f98ec3c9aa3840a513787003a5db196dd09b81699c3a81b252439929e4dcd
+  metadata.gz: 57db00976963f424efaab981a2b5066280b2de8dd8d3b241301ba3880fe1ce5c
+  data.tar.gz: fc386c30321ad3f94f03b00bfde72c19ea20dfebf400f6cc8322c841c5b5950b
 SHA512:
-  metadata.gz: 3e54f361e67a70f8c68f85469ffcc0c9da6c8269928b707b2e6e4b5c353e5bc19f64de3d93d50c7c37304822924bf8ca862e35e3f6a4ed692ad2781c444403bb
-  data.tar.gz: c12274971262bf327f9d2e6c29286bd1147fed6e5cf3d7a022a869d9810669e796fff20bfabcf13b3e973984a480a936e33468c4d4b2b7ad8f82737bf4b1b33d
+  metadata.gz: 4b9778b4e5a1dce3c1571bdd3038025b7ca6acec1dc9359cc4a04c5183dfd6640fd11fc06651d3059a5561f20d5f22974e6fa35c72d6b6273ee326b38c09612b
+  data.tar.gz: a2762f3a27e48b3445495d0ff16e46da23d80bd4d8e4a08f347df957fd3b595bc93f7697c769b92ba61bd633d57ec07b8df83c0bc2a1d374b763e48be9506724

data/lib/aac-metrics/loader.rb

@@ -357,6 +357,22 @@ module AACMetrics::Loader
     @@sentences[locale] = res
   end
 
+  def self.fringe_words(locale)
+    @@fringe_words ||= {}
+    return @@fringe_words[locale] if @@fringe_words[locale]
+    locale = locale.split(/-|_/)[0]
+    path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'sets', "fringe.#{locale}.json"))
+    all_words = []
+    list = JSON.parse(File.read(path))
+    list.each do |set|
+      set['categories'].each do |cat|
+        all_words += cat['words']
+      end
+    end
+    all_words.uniq!
+    @@synonyms[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

@@ -2,6 +2,9 @@
 # Scores for average effort level for word sets (spelling if that's th only way)
 # Effort scores for sentence corpus
 # Effort algorithms for scanning/eyes
+# TODO: manual way to flag button as conceptually
+#       related to the same-locaed button on the
+#       prior board, allowing for a discounted penalty
 module AACMetrics::Metrics
     # TODO: 
     # 1. When navigating from one board to the next, grid locations
@@ -21,11 +24,12 @@ module AACMetrics::Metrics
     locale = nil
     buttons = []
     refs = {}
-    total_boards = 1
+    grid = {}
 
     if obfset.is_a?(Hash) && obfset['buttons']
       locale = obfset['locale'] || 'en'
       refs = obfset['reference_counts']
+      grid = obfset['grid']
       buttons = []
       obfset['buttons'].each do |btn|
         buttons << {
@@ -42,7 +46,15 @@ module AACMetrics::Metrics
       visited_board_ids = {}
       to_visit = [{board: obfset[0], level: 0, entry_x: 1.0, entry_y: 1.0}]
       refs = {}
+      rows_tally = 0.0
+      cols_tally = 0.0
+      root_rows = nil
+      root_cols = nil
       obfset.each do |board|
+        root_rows ||= board['grid']['rows']
+        root_cols ||= board['grid']['columns']
+        rows_tally += board['grid']['rows']
+        cols_tally += board['grid']['columns']
         # determine frequency within the board set
         # for each semantic_id and clone_id
         if board['clone_ids']
@@ -58,6 +70,10 @@ module AACMetrics::Metrics
           end
         end
       end
+      if (rows_tally / obfset.length.to_f - root_rows).abs > 3 || (cols_tally / obfset.length.to_f - root_cols).abs > 3
+        root_rows = (rows_tally / obfset.length.to_f).floor
+        root_cols = (cols_tally / obfset.length.to_f).floor
+      end
       pcts = {}
       refs.each do |id, cnt|
         pcts[id] = cnt.to_f / obfset.length.to_f
@@ -191,6 +207,10 @@ module AACMetrics::Metrics
       total_boards: total_boards,
       total_buttons: buttons.length,
       reference_counts: refs,
+      grid: {
+        rows: root_rows,
+        columns: root_cols
+      },
       buttons: buttons,
       levels: clusters
     }
@@ -274,6 +294,7 @@ module AACMetrics::Metrics
     common_words_obj = AACMetrics::Loader.common_words(target[:locale])
     synonyms = AACMetrics::Loader.synonyms(target[:locale])
     sentences = AACMetrics::Loader.sentences(target[:locale])
+    fringe = AACMetrics::Loader.fringe_words(target[:locale])
     common_words_obj['efforts'].each{|w, e| sortable_efforts[w] ||= e }
     common_words = common_words_obj['words']
     
@@ -423,7 +444,6 @@ module AACMetrics::Metrics
         effort ||= spelling_effort(word)
         effort += (idx == 0) ? 0.0 : BOARD_CHANGE_PROCESSING_EFFORT
         comp_effort_score += effort
-        puts "      #{word} #{ee} #{effort}"
       end
       target_effort_score = target_effort_score / words.length
       comp_effort_score = comp_effort_score / words.length
@@ -431,8 +451,32 @@ module AACMetrics::Metrics
     end
     target_effort_tally += res[:sentences].map{|s| s[:effort] }.sum.to_f / res[:sentences].length.to_f * 3.0
     comp_effort_tally += res[:sentences].map{|s| s[:comp_effort] }.sum.to_f / res[:sentences].length.to_f * 3.0
-    target_effort_tally += 100 # placeholder value for future added calculations
-    comp_effort_tally += 100
+
+    res[:fringe_words] = []
+    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[:fringe_words] << {word: word, effort: target_effort_score, comp_effort: comp_effort_score}
+    end
+    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
 
 
 

data/lib/aac-metrics.rb

@@ -43,7 +43,7 @@
 # thing explainer phrases, lists of words
 
 module AACMetrics
-  VERSION = "0.1"
+  VERSION = "0.2"
   require 'aac-metrics/loader'
   require 'aac-metrics/metrics'
 end

data/sets/common_words.en.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1",
+  "version": "0.2",
   "files": [
     "l84f-e9fafa55d4.common.en.obfset",
     "qc60-61bbf6171e.common.en.obfset",