aac-metrics 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b00b87081818fb1fe8ff225b6b7120cc8bb26ba162d84c5a8c74f2e2571f6e84
-  data.tar.gz: 7115ff9b2081671fa60e3538e706b61deb3a8bb35bbf1b822c74cc90e4cd57eb
+  metadata.gz: 24e65891d54936aeecfeab18e673f39e27c8d85ed71131658118bf0764502dd6
+  data.tar.gz: f3eea991fad67e0445a52462a96e5af2f7e72737464c22883e80222926f2dd16
 SHA512:
-  metadata.gz: 93eeae92b189182a457ca487a75327cce7aff50912f08a7152aa3b9715335bba80940687916182cde9421b249425ecfcf2f086954cf8f51db7dbef31013849d5
-  data.tar.gz: 99eab7e060552fd6d11b80016aa9f9f687c59d5a445f4eddb039e61cb39aa35b4dcb0e9307efff51c13dd249ff6996300213b4d1aec4f509a3150e708122eac2
+  metadata.gz: 433769c391cb7039957b338c6263ad8c0c107b8e2c67f3bfe7e4e30276816290c859bad7add69bdb06ed58e88d25fc9400cd89dd9791b600d028f023483ff8f9
+  data.tar.gz: cdb2251cfa3d2531ffb2fa8b8cff28b0dc9902b19c8f83a43c8faa641981f92ad7cb1655c86d4b6f510df907ad41546fa63bfdd0475cebb41330348110a20ca2

data/lib/aac-metrics/metrics.rb

@@ -130,18 +130,24 @@ module AACMetrics::Metrics
     res = {}.merge(target)
 
     compare = AACMetrics::Metrics.analyze(compset, false)
+    res[:comp_boards] = compare[:total_boards]
+    res[:comp_buttons] = compare[:total_buttons]
     
     compare_words = []
     compare_buttons = {}
+    comp_efforts = {}
     compare[:buttons].each do |btn|
       compare_words << btn[:label]
       compare_buttons[btn[:label]] = btn
+      comp_efforts[btn[:label]] = btn[:effort]
     end
 
     efforts = {}
+    target_efforts = {}
     target_words = []
     res[:buttons].each{|b| 
       target_words << b[:label]
+      target_efforts[b[:label]] = b[:effort]
       efforts[b[:label]] = b[:effort] 
       comp = compare_buttons[b[:label]]
       if comp
@@ -199,26 +205,68 @@ module AACMetrics::Metrics
     missing = missing.select do |word|
       !synonyms[word] || (synonyms[word] & target_words).length == 0
     end
+    common_effort = 0
+    comp_effort = 0
+    common_words.each do |word|
+      effort = target_efforts[word]
+      if !effort && synonyms[word]
+        synonyms[word].each do |syn|
+          effort ||= target_efforts[syn]
+        end
+      end
+      effort ||= 2 + (word.length * 2.5)
+      common_effort += effort
+
+      effort = comp_efforts[word]
+      if !effort && synonyms[word]
+        synonyms[word].each do |syn|
+          effort ||= comp_efforts[syn]
+        end
+      end
+      effort ||= 2 + (word.length * 2.5)
+      comp_effort += effort
+    end
+    common_effort = common_effort.to_f / common_words.length.to_f
+    comp_effort = comp_effort.to_f / common_words.length.to_f
     # puts "MISSING FROM COMMON (#{missing.length})"
     res[:missing] = {
       :common => {name: "Common Word List", list: missing}
     }
+    res[:cores] = {
+      :common => {name: "Common Word List", list: common_words, average_effort: common_effort, comp_effort: comp_effort}
+    }
     # puts missing.join('  ')
     core_lists.each do |list|
       puts list['id']
       missing = []
+      list_effort = 0
+      comp_effort = 0
       list['words'].each do |word|
         words = [word] + (synonyms[word] || [])
         if (target_words & words).length == 0
           missing << word
-          raise "orng" if word == 'orange'
         end
+        effort = target_efforts[word]
+        if !effort
+          words.each{|w| effort ||= target_efforts[w] }
+        end
+        effort ||= 2 + (word.length * 2.5)
+        list_effort += effort
+        effort = comp_efforts[word]
+        if !effort
+          words.each{|w| effort ||= comp_efforts[w] }
+        end
+        effort ||= 2 + (word.length * 2.5)
+        comp_effort += effort
       end
       if missing.length > 0
         # puts "MISSING FROM #{list['id']} (#{missing.length}):"
-        res[:missing][list['id']] = {name: list['name'], list: missing}
+        res[:missing][list['id']] = {name: list['name'], list: missing, average_effort: list_effort}
         # puts missing.join('  ')
       end
+      list_effort = list_effort.to_f / list['words'].length.to_f
+      comp_effort = comp_effort.to_f / list['words'].length.to_f
+      res[:cores][list['id']] = {name: list['name'], list: list['words'], average_effort: list_effort, comp_effort: comp_effort}
     end
     # puts "CONSIDER MAKING EASIER"
     res[:high_effort_words] = too_hard

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aac-metrics
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Brian Whitmer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-08 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json