test patches

Author: krukah

src/clustering/abstraction.rs

@@ -174,9 +174,9 @@ impl std::fmt::Display for Abstraction {
 impl Arbitrary for Abstraction {
     fn random() -> Self {
         use rand::Rng;
-        let street = Street::random();
-        let n = street.k();
-        let i = rand::thread_rng().gen_range(0..n);
+        let street = Street::Flop;
+        let k = street.k();
+        let i = rand::thread_rng().gen_range(0..k);
         Abstraction::from((street, i))
     }
 }

src/clustering/metric.rs

@@ -51,6 +51,17 @@ impl Metric {
     /// entreis in our abstraction pair lookup table.
     /// if this is off by just a few then it probably means a bunch of collisions
     /// maybe i should determinsitcally seed kmeans process, could be cool for reproducability too
+    ///
+    /// TODO
+    ///
+    /// determine street dynamiccaly by checking for existence of XOR'ed abstraction pairs using
+    /// Abstraction::From(Street, Index)
+    ///
+    /// it's also not great that we are FORCED to have different number of abstractions
+    /// clusters K means for each street to avoid nC2 collisions !!
+    /// we should either just store Street as Self.1 or determine from XOR hits what street we're on
+    /// whichever solution should work with test case so we don't have to remove test case
+    /// to not overwrite existing metric. we like overwriting river.metric bc it can be empty
     fn street(&self) -> Street {
         fn choose_2(k: usize) -> usize {
             k * (k.saturating_sub(1)) / 2

src/mccfr/path.rs

@@ -15,7 +15,7 @@ impl Arbitrary for Path {
 /// we (un)pack the byte representation of the edges in a Path(u64) sequence
 impl From<Path> for Vec<Edge> {
     fn from(path: Path) -> Self {
-        (0..)
+        (0..16)
             .map(|i| i * 4)
             .map(|b| 0xF & (path.0 >> b))
             .map(|bits| bits as u8)
@@ -69,18 +69,17 @@ mod tests {
     #[test]
     fn bijective_path_empty() {
         let edges = vec![];
-        let round = Vec::<Edge>::from(Path::from(edges.clone()));
-        assert_eq!(edges, round);
+        let paths = Vec::<Edge>::from(Path::from(edges.clone()));
+        assert_eq!(edges, paths);
     }
 
     #[test]
     fn bijective_path_edges() {
         let edges = (0..)
             .map(|_| Edge::random())
-            .filter(|e| e.is_choice())
             .take(16)
             .collect::<Vec<Edge>>();
-        let round = Vec::<Edge>::from(Path::from(edges.clone()));
-        assert_eq!(edges, round);
+        let paths = Vec::<Edge>::from(Path::from(edges.clone()));
+        assert_eq!(edges, paths);
     }
 }

src/mccfr/profile.rs

@@ -568,6 +568,7 @@ impl std::fmt::Display for Profile {
         )
     }
 }
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -576,6 +577,11 @@ mod tests {
     use crate::Save;
 
     #[test]
+    #[ignore]
+    /// we don't run this test because we don't want to overwrite
+    /// an existing blueprint profile, and we no longer use any
+    /// arguments to the save function to write to a temporary name
+    /// and delete the file
     fn persistence() {
         let name = "test";
         let file = format!("{}.profile.pgcopy", name);