Fix rebase mess

Signed-off-by: Enrico Ghiorzi <[email protected]>
convince-project · Nov 18, 2024 · 2d05f14 · 2d05f14
1 parent df3b608
commit 2d05f14
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/scan_core/src/pmtl/numset.rs b/scan_core/src/pmtl/numset.rs
@@ -47,6 +47,18 @@ impl NumSet {
         }
     }
 
+    pub fn from_range(lower_bound: DenseTime, upper_bound: DenseTime) -> Self {
+        if lower_bound < upper_bound {
+            if lower_bound == (0, 0) {
+                Self(vec![(upper_bound, true)])
+            } else {
+                Self(vec![(lower_bound, false), (upper_bound, true)])
+            }
+        } else {
+            Self::new()
+        }
+    }
+
     #[inline(always)]
     pub fn bounds(&self) -> &[(DenseTime, bool)] {
         &self.0

diff --git a/src/cli.rs b/src/cli.rs
@@ -1,7 +1,15 @@
+use std::{
+    path::PathBuf,
+    sync::{
+        atomic::{AtomicU32, Ordering},
+        Arc,
+    },
+};
+
+use crate::PrintTrace;
 use clap::Parser;
 use indicatif::{ProgressBar, ProgressStyle};
-use scan::*;
-use crate::PrintTrace;
+use scan_fmt_xml::scan_core::*;
 
 /// A statistical model checker for large concurrent systems
 #[derive(Parser)]