fix docs and tests

domain-independent-dp · Dec 14, 2023 · e92802d · e92802d
1 parent da6ae13
commit e92802d
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 3 deletions.
diff --git a/didppy/docs/ref.bib b/didppy/docs/ref.bib
@@ -27,7 +27,7 @@ @inproceedings{LNBS
 
 @inproceedings{DIDPParallel,
   author    = {Ryo Kuroiwa and J. Christopher Beck},
-  booktitle = {Proceedings of the 38th Annual AAAI Conference on Artificial Intelligence},
+  booktitle = {Proceedings of the 38th Annual AAAI Conference on Artificial Intelligence (AAAI)},
   title     = {Parallel Beam Search Algorithms for Domain-Independent Dynamic Programming},
   year      = {2024}
 }

diff --git a/dypdl-heuristic-search/src/parallel_search_algorithm/data_structure/hd_node_channel.rs b/dypdl-heuristic-search/src/parallel_search_algorithm/data_structure/hd_node_channel.rs
@@ -6,7 +6,7 @@ use crossbeam_channel::{Receiver, Sender};
 /// # References
 ///
 /// Friedmann Mattern. "Algorithms for Distributed Termination Detection,"
-/// Distributed Computing, vol. 2, pp 161-175, 1987
+/// Distributed Computing, vol. 2, pp. 161-175, 1987.
 pub struct HdNodeChannel<N> {
     node_txs: Vec<Sender<(usize, N)>>,
     node_rx: Receiver<(usize, N)>,

diff --git a/dypdl-heuristic-search/src/parallel_search_algorithm/data_structure/termination_detector.rs b/dypdl-heuristic-search/src/parallel_search_algorithm/data_structure/termination_detector.rs
@@ -6,7 +6,7 @@ use std::cmp::max;
 /// # References
 ///
 /// Friedmann Mattern. "Algorithms for Distributed Termination Detection,"
-/// Distributed Computing, vol. 2, pp 161-175, 1987
+/// Distributed Computing, vol. 2, pp. 161-175, 1987.
 pub struct TerminationDetector {
     id: usize,
     clock: usize,

diff --git a/dypdl-heuristic-search/src/search_algorithm/data_structure/hashable_state.rs b/dypdl-heuristic-search/src/search_algorithm/data_structure/hashable_state.rs
@@ -287,6 +287,7 @@ mod tests {
     use dypdl::variable_type::Set;
     use dypdl::StateInterface;
     use dypdl::{expression::*, TableRegistry};
+    use std::rc::Rc;
 
     #[test]
     fn hashable_signature_variables() {
@@ -906,6 +907,64 @@ mod tests {
         );
     }
 
+    #[test]
+    fn state_with_hashable_signature_variable_from_state_in_registry() {
+        let mut set1 = Set::with_capacity(3);
+        set1.insert(0);
+        set1.insert(2);
+        let mut set2 = Set::with_capacity(3);
+        set2.insert(0);
+        set2.insert(1);
+        let signature_variables = HashableSignatureVariables {
+            set_variables: vec![set1, set2],
+            vector_variables: vec![vec![0, 2], vec![1, 2]],
+            element_variables: vec![1, 2],
+            integer_variables: vec![1, 2, 3],
+            continuous_variables: vec![OrderedFloat(1.0), OrderedFloat(2.0), OrderedFloat(3.0)],
+        };
+        let resource_variables = dypdl::ResourceVariables {
+            element_variables: vec![],
+            integer_variables: vec![4, 5, 6],
+            continuous_variables: vec![4.0, 5.0, 6.0],
+        };
+        let state = StateWithHashableSignatureVariables::from(StateInRegistry {
+            signature_variables: Rc::new(signature_variables.clone()),
+            resource_variables: resource_variables.clone(),
+        });
+        assert_eq!(
+            state.signature_variables.set_variables,
+            signature_variables.set_variables
+        );
+        assert_eq!(
+            state.signature_variables.vector_variables,
+            signature_variables.vector_variables
+        );
+        assert_eq!(
+            state.signature_variables.element_variables,
+            signature_variables.element_variables
+        );
+        assert_eq!(
+            state.signature_variables.integer_variables,
+            signature_variables.integer_variables
+        );
+        assert_eq!(
+            state.signature_variables.continuous_variables,
+            vec![OrderedFloat(1.0), OrderedFloat(2.0), OrderedFloat(3.0)]
+        );
+        assert_eq!(
+            state.resource_variables.element_variables,
+            resource_variables.element_variables
+        );
+        assert_eq!(
+            state.resource_variables.integer_variables,
+            resource_variables.integer_variables
+        );
+        assert_eq!(
+            state.resource_variables.continuous_variables,
+            resource_variables.continuous_variables
+        );
+    }
+
     #[test]
     fn state_with_hashable_signature_variables_get_number_of_set_variables() {
         let state = StateWithHashableSignatureVariables {