wip

hydro-project · Oct 10, 2024 · 1cb50d4 · 1cb50d4
1 parent 0e087df
commit 1cb50d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/hydroflow/tests/surface_lattice_bimorphism.rs b/hydroflow/tests/surface_lattice_bimorphism.rs
@@ -8,7 +8,7 @@ use lattices::map_union::{KeyedBimorphism, MapUnionHashMap, MapUnionSingletonMap
 use lattices::set_union::{CartesianProductBimorphism, SetUnionHashSet, SetUnionSingletonSet};
 use lattices::GhtType;
 use multiplatform_test::multiplatform_test;
-use variadics::variadic_collections::VariadicCountedHashSet;
+use variadics::variadic_collections::VariadicHashSet;
 use variadics::{var_expr, CloneVariadic};
 
 #[multiplatform_test]
@@ -152,7 +152,7 @@ fn test_ght_join_bimorphism() {
     type Output = variadics::var_type!(u32, u64, u16, &'static str, &'static str);
 
     type MyNodeBim = <(MyGhtATrie, MyGhtBTrie) as DeepJoinLatticeBimorphism<
-        VariadicCountedHashSet<Output>,
+        VariadicHashSet<Output>,
     >>::DeepJoinLatticeBimorphism;
     type MyBim = GhtBimorphism<MyNodeBim>;
 
@@ -183,7 +183,7 @@ fn test_ght_join_bimorphism() {
             -> lattice_reduce()
             -> enumerate()
             -> inspect(|x| println!("{:?} {:#?}", context.current_tick(), x))
-            -> flat_map(|(_num, ght)| ght.recursive_iter().map(<Output as CloneVariadic>::clone_var_ref).collect::<Vec<_>>())
+            -> flat_map(|(_num, ght)| ght.recursive_iter().map(<Output as CloneVariadic>::clone_ref_var).collect::<Vec<_>>())
             -> null();
             // -> for_each(|x| println!("{:#?}\n", x));
     };

diff --git a/hydroflow/tests/surface_lattice_generalized_hash_trie.rs b/hydroflow/tests/surface_lattice_generalized_hash_trie.rs
@@ -4,7 +4,7 @@ use hydroflow::lattices::ght_lattice::{DeepJoinLatticeBimorphism, GhtBimorphism}
 use hydroflow::lattices::GhtType;
 use hydroflow::util::collect_ready;
 use hydroflow::variadics::{var_expr, var_type};
-use variadics::variadic_collections::VariadicCountedHashSet; // Import the Insert trait
+use variadics::variadic_collections::VariadicHashSet; // Import the Insert trait
 
 #[test]
 fn test_basic() {
@@ -47,7 +47,7 @@ fn test_join() {
     let s = vec![var_expr!(1, 10), var_expr!(5, 50)];
 
     type MyNodeBim = <(MyGht, MyGht) as DeepJoinLatticeBimorphism<
-        VariadicCountedHashSet<var_type!(u8, u16, u16)>,
+        VariadicHashSet<var_type!(u8, u16, u16)>,
     >>::DeepJoinLatticeBimorphism;
     type MyBim = GhtBimorphism<MyNodeBim>;