aac-metrics 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52fb3c41b9427605e9a78c258c5f4e5d7303c98f8988b52aba750597cb164900
-  data.tar.gz: 60ccc8a6c1dd2c25d29dd159134c7953e133a1f7a0bb9d710696807f853e8139
+  metadata.gz: 9d8e0a136e07e00454338b3ddafc3d3374a0b38cb19f915110aef990dfea3f20
+  data.tar.gz: dcc8109cc6c77156e12205e7f518059696aa271d622b085ea0399877dd488542
 SHA512:
-  metadata.gz: ac227f5770623d9df36635c92f71aa7a122404fa40f006dce31432be0bd17b6199c0c16ec6a4f5c777f19255106bf1c7f8811bfe4972996b9d12980a75b2911a
-  data.tar.gz: fd2ef145c944fea960a30282b6f3960f313d5f6f44d0db13f3a4581909744e127455010371d5b4138e546132a2e8d4cfb26ec291793f9ff83b970b54d47aeed9
+  metadata.gz: 0de1a12d33d59f0440bab00fb60e426ced9c9cb95c2311931ac0a67a10032e1752b8803b91ef5fb5e80e1f0aa610575ae56917ef42ad7e15cbcb0ac04d4be31b
+  data.tar.gz: f372e88fcac486795074d2f425da2d9ff1651b7ad5e6af66b6df46b3e573c927ba30106465bdace6a350c3d6704b425f65bd4b1fb7b60a0ce4142fd2ba9eb83b

data/lib/aac-metrics/loader.rb

@@ -187,7 +187,10 @@ module AACMetrics::Loader
                   puts "Link found with no access #{btn['load_board'].to_json}"
                 end
                 new_btn['load_board']['temporary_home'] = true if new_btn['load_board'] && btn['load_board']['temporary_home']
+                new_btn['load_board']['temporary_home'] = true if new_btn['load_board'] && btn['ext_coughdrop_home_lock']
                 new_btn['load_board']['add_to_sentence'] = true if new_btn['load_board'] && btn['load_board']['add_to_sentence']
+                new_btn['load_board']['add_to_sentence'] = true if new_btn['load_board'] && btn['ext_coughdrop_add_to_vocalization']
+                new_btn['load_board']['add_to_sentence'] = true if new_btn['load_board'] && btn['ext_coughdrop_add_vocalization']
               elsif btn['action']
                 # TODO: track keyboard actions and don't
                 # treat action buttons for metrics

data/lib/aac-metrics/metrics.rb

@@ -1,14 +1,8 @@
 # TODO:
 # Qualitative evaluation criteria:
-# - 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
@@ -139,7 +133,8 @@ module AACMetrics::Metrics
       analysis_version: AACMetrics::VERSION,
       locale: locale,
       total_boards: total_boards,
-      total_buttons: buttons.length,
+      total_buttons: buttons.map{|b| b[:count] || 1}.sum,
+      total_words: buttons.map{|b| b[:label] }.uniq.length,
       reference_counts: set_refs,
       grid: {
         rows: root_rows,
@@ -360,6 +355,7 @@ module AACMetrics::Metrics
                   label: word,
                   level: board[:level],
                   effort: effort,
+                  count: ((existing || {})[:count] || 0) + 1
                 }
                 # If a board set has any temporary_home links,
                 # then that can possibly affect the effort
@@ -458,6 +454,7 @@ module AACMetrics::Metrics
     compare = AACMetrics::Metrics.analyze(compset, false)
     res[:comp_boards] = compare[:total_boards]
     res[:comp_buttons] = compare[:total_buttons]
+    res[:comp_words] = compare[:total_words]
     res[:comp_grid] = compare[:grid]
     
     compare_words = []