aac-metrics 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d8e0a136e07e00454338b3ddafc3d3374a0b38cb19f915110aef990dfea3f20
-  data.tar.gz: dcc8109cc6c77156e12205e7f518059696aa271d622b085ea0399877dd488542
+  metadata.gz: 177d88edba43f47e65e7080652f63cb7405056e7ba8d1d7f50e415082ecbecb9
+  data.tar.gz: 0420f4f6af64452a82a5546d35b99240771094389c9fdb88938ccd862803ac03
 SHA512:
-  metadata.gz: 0de1a12d33d59f0440bab00fb60e426ced9c9cb95c2311931ac0a67a10032e1752b8803b91ef5fb5e80e1f0aa610575ae56917ef42ad7e15cbcb0ac04d4be31b
-  data.tar.gz: f372e88fcac486795074d2f425da2d9ff1651b7ad5e6af66b6df46b3e573c927ba30106465bdace6a350c3d6704b425f65bd4b1fb7b60a0ce4142fd2ba9eb83b
+  metadata.gz: c28f80c87ca6e0a151913f4c6637b76d54e5b8658afb415c2ae3a9062289cc2d958e28f9108dfd7750723bbf3a15826555e48c44453f9ba049ce6e65955803a9
+  data.tar.gz: 8601390c7d6e9f78ab69157e71a0d4bab67dae0af250c5068a03b71108113ba17b815ec588d34554126ee1b264a8fbc07c8a86c17b3f59da96a16389b604c1a9

data/lib/aac-metrics/loader.rb

@@ -330,6 +330,7 @@ module AACMetrics::Loader
     path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'sets', "common_words.#{locale}.json"))    
     res = JSON.parse(File.read(path)) rescue nil
     if !res || res['version'] != AACMetrics::VERSION || res['files'] != files
+      # When version changes or the file list changes, regenerate
       efforts = {}
       common_words = nil
       common_paths.each do |path|
@@ -345,7 +346,8 @@ module AACMetrics::Loader
       end
       common_words -= ['']
       efforts.each do |word, vals|
-        if vals.length == common_paths.length
+        # If a word is in 80% of the common vocabs, include it in the list
+        if vals.length >= (common_paths.length * 0.8)
           efforts[word] = vals.sum.to_f / vals.length
         else
           efforts.delete(word)
@@ -401,7 +403,7 @@ module AACMetrics::Loader
     list = JSON.parse(File.read(path))
     list.each do |set|
       set['categories'].each do |cat|
-        all_words += cat['words']
+        all_words += cat['words'].sort unless cat['id'] == 'aggregate'
       end
     end
     all_words.uniq!

data/lib/aac-metrics/metrics.rb

@@ -622,11 +622,11 @@ module AACMetrics::Metrics
         end
 
         # Calculate the effort for the target and comp sets
-        effort, level = best_match(word, target_efforts, nil, synonyms)
+        effort, level, fallback = best_match(word, target_efforts, nil, synonyms)
         reffort = effort
         list_effort += effort
 
-        effort, level = best_match(word, comp_efforts, nil, synonyms)
+        effort, level, fallback = best_match(word, comp_efforts, nil, synonyms)
         comp_effort += effort
         # puts "#{word} - #{reffort.round(1)} - #{effort.round(1)}"
       end
@@ -654,11 +654,13 @@ module AACMetrics::Metrics
     res[:sentences] = []
     sentences.each do |words|
       sequence = best_combo(words, target_efforts, target_levels, synonyms)
-      target_effort_score = sequence.map{|w, e| e }.sum.to_f / words.length.to_f
+      target_effort_score = sequence[:list].map{|w, e| e }.sum.to_f / words.length.to_f
+      typing = sequence[:fallback]
       sequence = best_combo(words, comp_efforts, comp_levels, synonyms)
-      comp_effort_score = sequence.map{|w, e| e }.sum.to_f / words.length.to_f
+      comp_effort_score = sequence[:list].map{|w, e| e }.sum.to_f / words.length.to_f
+      comp_typing = sequence[:fallback]
 
-      res[:sentences] << {sentence: words.join(' '), words: words, effort: target_effort_score, comp_effort: comp_effort_score}
+      res[:sentences] << {sentence: words.join(' '), words: words, effort: target_effort_score, typing: typing, comp_effort: comp_effort_score, comp_typing: comp_typing}
     end
     res[:care_components][:sentences] = res[:sentences].map{|s| s[:effort] }.sum.to_f / res[:sentences].length.to_f * 3.0
     target_effort_tally += res[:care_components][:sentences]
@@ -666,14 +668,16 @@ module AACMetrics::Metrics
     comp_effort_tally += res[:care_components][:comp_sentences]
 
     res[:fringe_words] = []
+    res[:missing]['fringe'] = {name: "Fringe Large Possible Corpus", list: []}
     fringe.each do |word|
       target_effort_score = 0.0
       comp_effort_score = 0.0
 
-      effort, level = best_match(word, target_efforts, nil, synonyms)
+      effort, level, fallback = best_match(word, target_efforts, nil, synonyms)
       target_effort_score += effort
+      res[:missing]['fringe'][:list] << word if fallback
 
-      effort, level = best_match(word, comp_efforts, nil, synonyms)
+      effort, level, fallback = best_match(word, comp_efforts, nil, synonyms)
       comp_effort_score += effort
       res[:fringe_words] << {word: word, effort: target_effort_score, comp_effort: comp_effort_score}
     end
@@ -683,13 +687,15 @@ module AACMetrics::Metrics
     comp_effort_tally += res[:care_components][:comp_fringe]
 
     res[:common_fringe_words] = []
+    res[:missing]['common_fringe'] = {name: "High-Use Fringe Corpus", list: []}
     common_fringe.each do |word|
       target_effort_score = 0.0
       comp_effort_score = 0.0
-      effort, level = best_match(word, target_efforts, nil, synonyms)
+      effort, level, fallback = best_match(word, target_efforts, nil, synonyms)
       target_effort_score += effort
+      res[:missing]['common_fringe'][:list] << word if fallback
 
-      effort, level = best_match(word, comp_efforts, nil, synonyms)
+      effort, level, fallback = best_match(word, comp_efforts, nil, synonyms)
       comp_effort_score += effort
       res[:common_fringe_words] << {word: word, effort: target_effort_score, comp_effort: comp_effort_score}
     end
@@ -727,11 +733,16 @@ module AACMetrics::Metrics
         end
       end
     end
+    used_fallback = false
+
     # Fallback penalty for missing word
     fallback_effort = spelling_effort(word)
-    effort = fallback_effort if !effort || fallback_effort < effort
+    if !effort || fallback_effort < effort
+      used_fallback = true
+      effort = fallback_effort 
+    end
 
-    [effort, level || 0]
+    [effort, level || 0, used_fallback]
   end
 
   def self.best_combo(words, efforts, levels, synonyms)
@@ -755,26 +766,28 @@ module AACMetrics::Metrics
             options << {
               next_idx: idx + combo[:size],
               list: option[:list] + [[combo[:partial], combo[:effort]]],
-              temporary_home_id: combo[:temporary_home_id]
+              temporary_home_id: combo[:temporary_home_id],
+              fallback: option[:fallback]
             }
           end
-          effort, level = best_match(words[idx], efforts, levels, synonyms)
+          effort, level, fallback = best_match(words[idx], efforts, levels, synonyms)
           option[:temporary_home_id] = effort.instance_variable_get('@temp_home_id')
+          option[:fallback] = true if fallback
           effort += BOARD_CHANGE_PROCESSING_EFFORT if idx > 0 && level && level > 0
           if home_id
             effort += BOARD_HOME_EFFORT + BOARD_CHANGE_PROCESSING_EFFORT
-            other_effort, other_level = best_match(words[idx], efforts["H:#{home_id}"] || {}, levels["H:#{home_id}"] || {}, synonyms)
+            other_effort, other_level, other_fallback = best_match(words[idx], efforts["H:#{home_id}"] || {}, levels["H:#{home_id}"] || {}, synonyms)
             new_home_id = other_effort.instance_variable_get('@temp_home_id') || home_id
             other_effort += BOARD_CHANGE_PROCESSING_EFFORT if idx > 0 && other_level && other_level > 0
             other_list = option[:list] + [[words[idx], other_effort]]
-            options << {next_idx: idx + 1, list: other_list, temporary_home_id: new_home_id}
+            options << {next_idx: idx + 1, list: other_list, temporary_home_id: new_home_id, fallback: option[:fallback] || other_fallback}
           end
           option[:list] << [words[idx], effort]
           option[:next_idx] = idx + 1
         end
       end
     end
-    options.sort_by{|o| o[:list].map{|w, e| e}.sum }.reverse[0][:list]
+    options.sort_by{|o| o[:list].map{|w, e| e}.sum }.reverse[0]
   end
 
   # Checks if any buttons will work for multiple words in a sentence

data/sets/ac99-3db3a9ef48.obfset

@@ -87509,7 +87509,7 @@
       },
       {
         "id": "btn10",
-        "label": "$3fd14da919"
+        "label": "$c18788c2f2"
       },
       {
         "id": "btn11",

data/sets/base_words.en.json

@@ -694,7 +694,6 @@
   "ea579aa7a9": "anemone",
   "f4f068e71e": "angel",
   "b192bef6f9": "angel hair",
-  "18a7bc65cb": "angel.",
   "f79ad03c84": "angelfish",
   "0b0b1cd211": "angelman",
   "9d0702e9cf": "anger",
@@ -1523,7 +1522,6 @@
   "6ff47afa5d": "brown",
   "446f8725d2": "brown sugar",
   "73c442ef8f": "brownie",
-  "dc41ad3977": "brownie.",
   "beef876dd2": "browse",
   "8e3f1bbb73": "browser",
   "f5e1271d0e": "bruise",
@@ -1617,7 +1615,6 @@
   "df3f079de6": "by",
   "bfa99df33b": "bye",
   "c413c15c69": "bye!",
-  "803dc11589": "bye.",
   "4a8a08f09d": "c",
   "cfa5ef7d62": "c-section",
   "b3188adab3": "cabbage",
@@ -1974,7 +1971,6 @@
   "9a673db46b": "chicken parmesan",
   "330adca824": "chicken sandwich",
   "f5970ca52c": "chicken soup",
-  "d624b81b9f": "chicken.",
   "f720e6f2f0": "chickpeas",
   "1b7d572653": "child",
   "a931704b40": "child vocabulary",
@@ -3975,7 +3971,6 @@
   "9862ca2c10": "fools",
   "855d366471": "foosball",
   "d8735f7489": "foot",
-  "3e55155032": "foot.",
   "37b4e2d829": "football",
   "98c731915e": "football game",
   "53ab9fba48": "footrest",
@@ -4324,7 +4319,6 @@
   "ab4c946c01": "good luck",
   "2b849500e4": "good morning",
   "56b611281b": "good night",
-  "bb90ce54cc": "good night.",
   "69faab6268": "goodbye",
   "1ed7834a0c": "goodbye,",
   "836508b6b1": "goodbyes",
@@ -5599,7 +5593,6 @@
   "c5ba5c73d9": "lately",
   "c18788c2f2": "later",
   "93559a4eec": "later on?",
-  "3fd14da919": "later.",
   "71ccb7a35a": "latest",
   "28c1e37e31": "latitude",
   "c65fce3822": "latter",
@@ -5689,7 +5682,6 @@
   "9a31962b95": "letters",
   "f7fde5962d": "letting",
   "8cbd191432": "lettuce",
-  "1c4ac98a4c": "lettuce.",
   "c9e9a84892": "level",
   "7493614e77": "leveled",
   "99aa4f40df": "leveling",
@@ -6126,7 +6118,6 @@
   "23cbeacdea": "mentor",
   "8d6ab84ca2": "menu",
   "4a4be40c96": "meow",
-  "7b63177c4a": "meow.",
   "abe10f7e5a": "mercury",
   "65464c31b2": "merge",
   "2ccb3dd497": "mermaid",
@@ -6968,7 +6959,6 @@
   "4113eabc76": "orange chicken",
   "fc0ed5f547": "orange hawkweed",
   "8c24f146ad": "orange juice",
-  "d37696261b": "orange.",
   "91b07b3169": "oranges",
   "65635cd7a7": "orangutan",
   "119d6ce059": "orbit",
@@ -7953,7 +7943,6 @@
   "ecae13117d": "read",
   "6905b82005": "read aloud",
   "ce5c36aa35": "read description",
-  "bc01793dab": "read.",
   "eceadc1d40": "reading",
   "2c77c703bd": "reading comprehension",
   "1ff0558681": "readng",
@@ -8438,7 +8427,6 @@
   "93cdc079d2": "saving",
   "4bfddaa41f": "savings",
   "a07a8f8eab": "saw",
-  "03ba9ae4f1": "saw.",
   "e57ea0cf27": "saxophone",
   "a53ff64efd": "say",
   "07fcf417df": "say bye-bye",
@@ -10522,7 +10510,6 @@
   "96f5c06fee": "tough",
   "b71f39b953": "toupee",
   "f0a4025b3b": "tour",
-  "44a0cd4080": "tour.",
   "5b8280a83c": "toured",
   "40bd330d8f": "touring",
   "9c0763361a": "tourist",
@@ -10608,7 +10595,7 @@
   "58723627fc": "trial",
   "cef44b46f1": "triangle",
   "075cc979c7": "triangle equilateral",
-  "abb24ab301": "triangle.",
+  "abb24ab301": "triangle",
   "c83040fe8a": "triangular",
   "81562c03d4": "triassic",
   "e6c008b012": "triceratops",
@@ -10688,7 +10675,6 @@
   "13621569c0": "tunnel",
   "ad0b1081f8": "tupperware",
   "db77174aa3": "turkey",
-  "a0c32525f7": "turkey.",
   "7a74a6bc6f": "turkish",
   "a850c17cba": "turn",
   "546fa8c1ee": "turn off",
@@ -11540,7 +11526,6 @@
   "bc14c07fbb": "yellowknife",
   "125085a41c": "yells",
   "a6105c0a61": "yes",
-  "4f7b50bec7": "yes.",
   "4b6ec19e9b": "yes/no\nplease/thanks",
   "eac9e8dd85": "yesterday",
   "1363512db5": "yesterday was",

data/sets/bl99-f7fa334245.obfset

@@ -4562,7 +4562,7 @@
       },
       {
         "id": "btn12",
-        "label": "$803dc11589"
+        "label": "$bfa99df33b"
       },
       {
         "id": "btn13",
@@ -17217,7 +17217,7 @@
       },
       {
         "id": "btn34",
-        "label": "$1c4ac98a4c"
+        "label": "$8cbd191432"
       },
       {
         "id": "btn35",

data/sets/fringe.en.json

@@ -79,7 +79,12 @@
           "whale",
           "wolf",
           "worm",
-          "zebra"
+          "zebra",
+          "fin",
+          "mollusk",
+          "farm animal",
+          "minnow",
+          "woodpecker"
         ]
       },
       {
@@ -109,6 +114,7 @@
           "eyes",
           "lips",
           "mouth",
+          "tooth",
           "teeth",
           "tongue",
           "cheek",
@@ -164,6 +170,56 @@
           "physical"
         ]
       },
+      {
+        "name": "Identity",
+        "id": "identity",
+        "words": [
+          "disabled",
+          "ableism",
+          "ableist",
+          "abolition",
+          "autistic",
+          "belong",
+          "belonging",
+          "culture",
+          "discriminate",
+          "discrimination",
+          "diversity",
+          "enslave",
+          "equal",
+          "equality",
+          "equity",
+          "exclude",
+          "free",
+          "freedom",
+          "immigrant",
+          "include",
+          "inclusion",
+          "indigenous",
+          "inequality",
+          "inequity",
+          "injustice",
+          "justice",
+          "liberty",
+          "liberate",
+          "liberation",
+          "neurodivergent",
+          "neurodiversity",
+          "neurotypical",
+          "protect",
+          "protest",
+          "power",
+          "racism",
+          "racist",
+          "refugee",
+          "rights",
+          "segregation",
+          "settler",
+          "slave",
+          "slavery",
+          "society"
+        ]
+      },
       {
         "name": "Calendar",
         "id": "calendar",
@@ -336,7 +392,6 @@
           "cereal",
           "cheddar",
           "cheese",
-          "cheeseburger",
           "cheetohs",
           "chips",
           "chow mein",
@@ -404,7 +459,25 @@
           "toast",
           "tortilla",
           "waffle",
-          "yogurt"
+          "yogurt",
+          "stir fry",
+          "brussel sprouts",
+          "eggroll",
+          "berry",
+          "melon",
+          "beet",
+          "teapot",
+          "fries",
+          "jellybeans",
+          "almond",
+          "cinnamon bun",
+          "nectar",
+          "slushie",
+          "applesauce",
+          "fruit snack",
+          "honeydew",
+          "snow peas",
+          "mashed potatoes"
         ]
       },
       {
@@ -517,7 +590,8 @@
           "soda pop",
           "straw",
           "tea",
-          "water"
+          "water",
+          "beverage"
         ]
       },
       {
@@ -576,7 +650,9 @@
           "toothbrush",
           "toothpaste",
           "towel",
-          "washcloth"
+          "washcloth",
+          "tub",
+          "bath tub"
         ]
       },
       {
@@ -790,6 +866,8 @@
           "flu",
           "handicapped",
           "headache",
+          "band-aid",
+          "allergy",
           "health",
           "I have pain",
           "I need medications",
@@ -866,12 +944,14 @@
           "bass",
           "cello",
           "clarinet",
+          "cymbal",
           "drums",
           "flute",
           "guitar",
           "piano",
           "saxophone",
           "song",
+          "tambourine",
           "treble",
           "trombone",
           "trumpet",
@@ -1093,7 +1173,15 @@
           "tree",
           "tulip",
           "vine",
-          "weed"
+          "weed",
+          "petal",
+          "spade",
+          "rosebud",
+          "poppy",
+          "crocus",
+          "day lily",
+          "orchid",
+          "primrose"
         ]
       },
       {
@@ -1399,6 +1487,7 @@
         "name": "Vehicles",
         "id": "vehicle",
         "words": [
+          "vehicle",
           "ambulance",
           "bike",
           "boat",
@@ -1887,7 +1976,25 @@
           "wasn't",
           "weren't",
           "wonderful",
-          "wouldn't"
+          "wouldn't",
+          "thankful",
+          "backwards",
+          "faster",
+          "cheerful",
+          "hostile",
+          "athletic",
+          "artistic",
+          "creative",
+          "charming",
+          "entertaining",
+          "helpful",
+          "solution",
+          "independent",
+          "incredible",
+          "responsible",
+          "selfish",
+          "super"
+          
         ]
       },
       {
@@ -2498,11 +2605,13 @@
           "scissors",
           "stamp",
           "stapler",
+          "staple",
+          "tape",
+          "paper clip",
           "stickers",
           "thread",
           "camera",
           "movie",
-          "taken",
           "takes",
           "taking",
           "took",
@@ -2526,7 +2635,6 @@
           "hospital",
           "jail",
           "leaving",
-          "library",
           "park",
           "places",
           "playground",
@@ -2778,6 +2886,14 @@
           "light bulb",
           "laundry",
           "living room",
+          "nursery",
+          "circus",
+          "mansion",
+          "chimney",
+          "book store",
+          "dog house",
+          "curtain",
+          "laundry room",
           "lock",
           "luggage",
           "mailbox",
@@ -2874,7 +2990,6 @@
           "toast",
           "tomato",
           "vegetable",
-          "watermelon",
           "wonton soup",
           "baking powder",
           "baking soda",
@@ -3533,7 +3648,6 @@
           "swallow",
           "tea",
           "wine",
-          "beetle",
           "butterfly",
           "caterpillar",
           "daffodil",
@@ -3762,7 +3876,7 @@
           "wagon",
           "skateboard",
           "kill",
-          "legos",
+          "lego",
           "checkers",
           "dominos",
           "guitar",
@@ -3950,7 +4064,6 @@
           "tan",
           "grey",
           "vomit",
-          "tissue",
           "ache",
           "make-up",
           "disagree",
@@ -4005,6 +4118,7 @@
           "jungle",
           "hurts",
           "hurting",
+          "ouch",
           "cleaner",
           "considerate",
           "calling",
@@ -4033,7 +4147,88 @@
           "hair dryer",
           "vacuum cleaner",
           "food processor",
-          "fiction"
+          "fiction",
+          "congratulations",
+          "channel",
+          "embarrass",
+          "mixture",
+          "happened",
+          "sophomore",
+          "equipment",
+          "poker",
+          "pastor",
+          "lacrosse",
+          "hardware",
+          "temple",
+          "telephone",
+          "ferry",
+          "freezer",
+          "minivan",
+          "mount",
+          "washer",
+          "macaroni",
+          "headrest",
+          "strap",
+          "walker",
+          "alarm clock",
+          "witch",
+          "cookie sheet",
+          "cookie cutter",
+          "rhombus",
+          "butterscotch",
+          "hannukah",
+          "merry",
+          "cannot",
+          "closed",
+          "ponytail",
+          "hollywood",
+          "beauty",
+          "accounting",
+          "post it",
+          "jam",
+          "evaluation",
+          "den",
+          "rule",
+          "locked",
+          "ashtray",
+          "santa hat",
+          "slippery",
+          "see through",
+          "quill",
+          "driver's license",
+          "cherry tree",
+          "4th of July",
+          "cigarette",
+          "easter bunny",
+          "muffler",
+          "nationality",
+          "pumpkin patch",
+          "understood",
+          "refill",
+          "polo",
+          "score board",
+          "squirt",
+          "tour",
+          "victory",
+          "appointment",
+          "bedtime",
+          "cash",
+          "rap",
+          "hip hop",
+          "fever",
+          "silverware",
+          "hole punch",
+          "tear",
+          "tighten",
+          "shine",
+          "slice",
+          "mow",
+          "zap",
+          "crash",
+          "staple",
+          "steal",
+          "cancel",
+          "kind of"
         ]
       }
     ]