Consider approx in idigest

Author: manpen

src/commands/check.rs

@@ -1,5 +1,5 @@
 use crate::commands::arguments::CommandCheckArgs;
-use pace26checker::digest::algo::{digest_instance, digest_solution};
+use pace26checker::digest::algo::{digest_instance_with_approx, digest_solution};
 use pace26checker::{checks::checker::*, io::forest_dot_writer::ForestDotWriter};
 use pace26remote::job_description::JobDescription;
 use pace26remote::upload::{Upload, UploadError};
@@ -47,7 +47,9 @@ pub async fn command_check(args: &CommandCheckArgs) -> Result<(), CommandCheckEr
                     .iter()
                     .map(|(_, t)| t.clone())
                     .collect::<Vec<_>>();
-                let idigest = digest_instance(trees, instance.num_leaves);
+
+                let idigest =
+                    digest_instance_with_approx(trees, instance.num_leaves, instance.approx());
 
                 let trees = solution
                     .trees()
@@ -91,7 +93,8 @@ pub async fn command_check(args: &CommandCheckArgs) -> Result<(), CommandCheckEr
                 .iter()
                 .map(|(_, t)| t.clone())
                 .collect::<Vec<_>>();
-            let idigest = digest_instance(trees, instance.num_leaves);
+            let idigest =
+                digest_instance_with_approx(trees, instance.num_leaves, instance.approx());
 
             println!("#s idigest \"{idigest}\"");
         }

testcases/valid_solutions/score10_n07l_lkc_with_approx.in

@@ -0,0 +1,6 @@
+#p 2 20
+#a 1.2 1337
+#s name "Test 01"
+#s description "This is a test instance"
+(((8,(5,(1,19))),17),(((10,16),((2,11),14)),(20,(9,((3,((4,(6,13)),(12,7))),(18,15))))));
+(((((8,10),(2,11)),(16,4)),((3,(12,(13,19))),((6,(9,18)),(14,20)))),(((1,7),(15,5)),17));

testcases/valid_solutions/score10_n07l_lkc_with_approx.out

@@ -0,0 +1,10 @@
+(((5,1),17),((10,16),(20,(9,18))));
+6;
+4;
+7;
+19;
+15;
+8;
+(2,11);
+(3,(13,12));
+14;

tests/command_check.rs

@@ -150,18 +150,7 @@ fn invalid_cases() {
     }
 }
 
-#[test]
-fn digest() {
-    let instance_path = testcase_dir()
-        .join("valid_solutions")
-        .join("score10_n07l_lkc.in");
-    let solution_path = testcase_dir()
-        .join("valid_solutions")
-        .join("score10_n07l_lkc.out");
-
-    const IDIGEST: &str = "015e2a313c3470afe151d1ac2a20b0f3";
-    const SDIGEST: &str = "000a5d234052384b8fd9ea7bac0d3c17";
-
+fn test_digest(instance_path: &Path, idigest: &str, solution_path: &Path, sdigest: &str) {
     for with_solution in [false, true] {
         let mut args = vec![
             String::from("check"),
@@ -178,10 +167,40 @@ fn digest() {
         assert!(output.status.success());
         let stdout = String::from_utf8(output.stdout).unwrap();
 
-        assert!(stdout.contains(format!("#s idigest \"{IDIGEST}\"").as_str()));
+        assert!(stdout.contains(format!("#s idigest \"{idigest}\"").as_str()));
 
         if with_solution {
-            assert!(stdout.contains(format!("#s sdigest \"{SDIGEST}\"").as_str()));
+            assert!(stdout.contains(format!("#s sdigest \"{sdigest}\"").as_str()));
         }
     }
 }
+
+#[test]
+fn digest() {
+    let instance_path = testcase_dir()
+        .join("valid_solutions")
+        .join("score10_n07l_lkc.in");
+    let solution_path = testcase_dir()
+        .join("valid_solutions")
+        .join("score10_n07l_lkc.out");
+
+    const IDIGEST: &str = "015e2a313c3470afe151d1ac2a20b0f3";
+    const SDIGEST: &str = "000a5d234052384b8fd9ea7bac0d3c17";
+
+    test_digest(&instance_path, IDIGEST, &solution_path, SDIGEST);
+}
+
+#[test]
+fn digest_with_approx() {
+    let instance_path = testcase_dir()
+        .join("valid_solutions")
+        .join("score10_n07l_lkc_with_approx.in");
+    let solution_path = testcase_dir()
+        .join("valid_solutions")
+        .join("score10_n07l_lkc.out");
+
+    const IDIGEST: &str = "014a7e1e21661a4913f46daa871f53a3";
+    const SDIGEST: &str = "000a5d234052384b8fd9ea7bac0d3c17";
+
+    test_digest(&instance_path, IDIGEST, &solution_path, SDIGEST);
+}