Skip to content

22270: Refactors get_hierarchy output, MAJOR #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
howsoRes merged 22 commits into from
Nov 26, 2024
Merged

22270: Refactors get_hierarchy output, MAJOR #368

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
61eac0a
22263: Rename path parameters, MAJOR
howsoRes Nov 20, 2024
250ad7f
change inputs for subtrainee methods
howsoRes Nov 21, 2024
5d7646e
subtrainee methods must be called directly
howsoRes Nov 21, 2024
9860531
Merge branch 'main' into 22263-hierarchy-operations-update
howsoRes Nov 21, 2024
0f12931
fix dd
howsoRes Nov 21, 2024
aa846dd
docstring cleanup
howsoRes Nov 21, 2024
ffffbaa
misc fixes
howsoRes Nov 22, 2024
ec257a8
fixes
howsoRes Nov 22, 2024
b13f43d
Merge branch 'main' into 22263-hierarchy-operations-update
howsoRes Nov 22, 2024
3df9fc8
test fix
howsoRes Nov 22, 2024
087ba85
sanitize output paths
howsoRes Nov 22, 2024
959fe98
22270: Refactored get_hierarchy, MAJOR
howsoRes Nov 22, 2024
43518d9
filename default to null
howsoRes Nov 22, 2024
a062963
min size for path for rename_subtrainee
howsoRes Nov 22, 2024
923d873
validation on rename_subtrainee
howsoRes Nov 22, 2024
8732519
save caml fix
howsoRes Nov 22, 2024
73eecfd
user friendly error message for existing subtrainee
howsoRes Nov 23, 2024
9a61fb5
filename is required
howsoRes Nov 23, 2024
60863ae
Merge branch '22263-hierarchy-operations-update' into 22270-get-hiera…
howsoRes Nov 25, 2024
e003d8e
Merge branch 'main' into 22270-get-hierarchy-revamp
howsoRes Nov 25, 2024
0002a99
get hierarchy updates
howsoRes Nov 25, 2024
2cd65d4
always output path as list
howsoRes Nov 25, 2024
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
52 changes: 38 additions & 14 deletions howso/hierarchy.amlg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
; type "assoc"
; description "The map showing the full hierarchy of the Trainee and all of its subtrainees."
; }
(assoc)
(assoc
;{type "list" values "string"}
;path to this trainee as a list of path labels
path_list []
)
(call !Return (assoc payload (call !GetHierarchy) ))
)

Expand Down Expand Up @@ -845,22 +849,42 @@
;method to recurse down the the hierarchy to output the currently contained hierarchy as a nested assoc
;with (false) for trainees that are stored independently
#!GetHierarchy
(let
(assoc children (indices !childTraineeIsContainedMap))

(zip
children
(map
(lambda
(if (get !childTraineeIsContainedMap (current_value))
(get (call_entity (list !traineeContainer (current_value 1)) "get_hierarchy") (list 1 "payload"))
(append
!metaData
(assoc
"id" (retrieve_from_entity "!traineeId")
"path" path_list
"contained" (true)
"children"
(map
(lambda
(if (get !childTraineeIsContainedMap (current_value))
(get
(call_entity (list !traineeContainer (current_value 1)) "get_hierarchy" (assoc
path_list
(if (size path_list)
(append path_list (current_value 1))
(current_value 1)
)
))
[1 "payload"]
)

;can't traverse down trainees that are stored externally
(false)
;can't traverse down trainees that are stored externally
(assoc
"id" (get !containedTraineeNameToIdMap (current_value 1))
"path"
(if (size path_list)
(append path_list (current_value 1))
(current_value 1)
)
"contained" (false)
"children" []
)
)
)
(indices !childTraineeIsContainedMap)
)
children
)
)
)

Expand Down
227 changes: 197 additions & 30 deletions unit_tests/ut_h_hierarchy_by_id.amlg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,56 @@

(print "Renames and copies: ")
(call assert_same (assoc
unordered (true)
obs result
exp
(assoc
AA (assoc
b (assoc)
big_C (assoc e (assoc))
)
c_copy (assoc e (assoc))
)
{
contained (true)
id "model"
path []
children [
{
children [
{
children [
{
children []
contained (true)
id "e3"
path ["AA" "big_C" "e"]
}
]
contained (true)
id "c2"
path ["AA" "big_C"]
}
{
children []
contained (true)
id "b2"
path ["AA" "b"]
}
]
contained (true)
id "A1"
path ["AA"]
}
{
children [
{
children []
contained (true)
id "e3"
path ["c_copy" "e"]
}
]
contained (true)
id "deleteme"
path ["c_copy"]
}
]

}
))

(call exit_if_failures (assoc msg "Renaming."))
Expand Down Expand Up @@ -266,15 +307,48 @@
(call keep_result_payload)
(print "Updated is_contained_map has all the c_copy trainees as not contained: ")
(call assert_same (assoc
unordered (true)
obs result
exp
(assoc
AA (assoc
b (assoc)
big_C (assoc e (assoc))
)
c_copy (false)
)
{
children [
{
children [
{
children [
{
children []
contained (true)
id "e3"
path ["AA" "big_C" "e"]
}
]
contained (true)
id "c2"
path ["AA" "big_C"]
}
{
children []
contained (true)
id "b2"
path ["AA" "b"]
}
]
contained (true)
id "A1"
path "AA"
}
{
children []
contained (false)
id "deleteme"
path "c_copy"
}
]
contained (true)
id "model"
path []
}
))

;load into trainee AA
Expand Down Expand Up @@ -331,16 +405,71 @@

(print "Hierarchy for model after save and load is correct: ")
(call assert_same (assoc
unordered (true)
obs result
exp
(assoc
AA (assoc
b (assoc child_of_b (false))
big_C (assoc e (assoc))
loaded (assoc e (assoc))
)
c_copy (false)
)
{
children [
{
children [
{
children [
{
children []
contained (true)
id "e3"
path ["AA" "big_C" "e"]
}
]
contained (true)
id "c2"
path ["AA" "big_C"]
}
{
children [
{
children []
contained (true)
id "e3"
path ["AA" "loaded" "e"]
}
]
contained (true)
id "deleteme"
path ["AA" "loaded"]
}
{
children [
{
children []
contained (false)
id "deleteme2"
path ["AA" "b" "child_of_b"]
}
]
contained (true)
id "b2"
path ["AA" "b"]
}
]
contained (true)
id "A1"
path "AA"
}
{
children []
contained (false)
id "deleteme"
path "c_copy"
}
]
contained (true)
id "model"
path
;{type "string"}
;path to this trainee as a list of path labels
[]
}
))

;cleanup saved test model
Expand Down Expand Up @@ -408,16 +537,54 @@

(print "Hierarchy for model after deletion: ")
(call assert_same (assoc
unordered (true)
obs result
exp
(assoc
AA (assoc
b (assoc)
big_C (assoc e (assoc))
loaded (assoc)
)
c_copy (false)
)
{
children [
{
children [
{
children [
{
children []
contained (true)
id "e3"
path ["AA" "big_C" "e"]
}
]
contained (true)
id "c2"
path ["AA" "big_C"]
}
{
children []
contained (true)
id "deleteme"
path ["AA" "loaded"]
}
{
children []
contained (true)
id "b2"
path ["AA" "b"]
}
]
contained (true)
id "A1"
path "AA"
}
{
children []
contained (false)
id "deleteme"
path "c_copy"
}
]
contained (true)
id "model"
path []
}
))

(call exit_if_failures (assoc msg "delete trainees." ))
Expand Down
Loading