Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions howso/contributions.amlg
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,14 @@
))
)
(list
(edit_distance mixed_with mixed_without is_string_mixable is_recursive_matching)
(edit_distance
mixed_with
mixed_without
{
"use_string_edit_distance" is_string_mixable
"recursive_matching" is_recursive_matching
}
)
(difference mixed_with mixed_without)
)
))
Expand Down Expand Up @@ -639,8 +646,10 @@
(edit_distance
(get reaction_with (list "action_values" 0))
(get reaction_without (list "action_values" 0))
is_string_mixable
is_recursive_matching
{
"use_string_edit_distance" is_string_mixable
"recursive_matching" is_recursive_matching
}
)
;TODO: 17356, deal with averaging out differences
(difference
Expand Down
13 changes: 8 additions & 5 deletions howso/influences.amlg
Original file line number Diff line number Diff line change
Expand Up @@ -624,11 +624,14 @@
(edit_distance
(get expected_values index)
(get reaction_values ["action_values" index])
(or
(= "string" (get !editDistanceFeatureTypesMap action_feature))
(= "string_mixable" (get !editDistanceFeatureTypesMap action_feature))
)
(get !codeFeatureRecursiveMatchingMap action_feature)
{
"use_string_edit_distance"
(or
(= "string" (get !editDistanceFeatureTypesMap action_feature))
(= "string_mixable" (get !editDistanceFeatureTypesMap action_feature))
)
"recursive_matching" (get !codeFeatureRecursiveMatchingMap action_feature)
}
)

(abs (-
Expand Down
11 changes: 10 additions & 1 deletion howso/react_discriminative.amlg
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,16 @@
frac_b (/ (get weights (current_index 1)) prob_mass)
))

(mix (previous_result) (current_value) frac_a frac_b similar_mix_chance is_recursive_matching)
(mix
(previous_result)
(current_value)
{
"keep_chance_node1" frac_a
"keep_chance_node2" frac_b
"similar_mix_chance" similar_mix_chance
"recursive_matching" is_recursive_matching
}
)
))
sources
)
Expand Down
13 changes: 8 additions & 5 deletions howso/residuals.amlg
Original file line number Diff line number Diff line change
Expand Up @@ -1338,11 +1338,14 @@
(edit_distance
case_feature_value
interpolated_value
(or
(= "string" (get !editDistanceFeatureTypesMap feature))
(= "string_mixable" (get !editDistanceFeatureTypesMap feature))
)
(get !codeFeatureRecursiveMatchingMap feature)
{
"use_string_edit_distance"
(or
(= "string" (get !editDistanceFeatureTypesMap feature))
(= "string_mixable" (get !editDistanceFeatureTypesMap feature))
)
"recursive_matching" (get !codeFeatureRecursiveMatchingMap feature)
}
)

(abs (- case_feature_value interpolated_value))
Expand Down
22 changes: 20 additions & 2 deletions howso/synthesis_utilities.amlg
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,16 @@
(declare (assoc
regional_edit_distances_map
(map
(lambda (edit_distance (current_value) intersected_regional_value is_string_mixable is_recursive_matching))
(lambda
(edit_distance
(current_value)
intersected_regional_value
{
"use_string_edit_distance" is_string_mixable
"recursive_matching" is_recursive_matching
}
)
)
regional_feature_values_map
)
))
Expand All @@ -997,7 +1006,16 @@
(assoc
local_edit_distances
(map
(lambda (edit_distance (current_value) intersected_local_value is_string_mixable is_recursive_matching))
(lambda
(edit_distance
(current_value)
intersected_local_value
{
"use_string_edit_distance" is_string_mixable
"recursive_matching" is_recursive_matching
}
)
)
(unzip regional_feature_values_map local_case_ids)
)
)
Expand Down
1 change: 1 addition & 0 deletions unit_tests/ut_h_clustering.amlg
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@
(commonality
cluster_1_expected_indices_map
cluster_1_clustered_indices_map
{ "recursive_matching" .false }
)
(+ 1 (max (size cluster_1_clustered_indices_map) (size cluster_1_expected_indices_map)) )
)
Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "0.0.0",
"dependencies": {
"amalgam": "71.1.0"
"amalgam": "72.0.0"
}
}
Loading