Merge branch 'feature/refactor-solver' into release/0.6.0

Author: blackopsrepl

Cargo.lock

@@ -49,6 +49,11 @@ rand = "0.9"  # Updated from 0.8
 rand_chacha = "0.9"  # Updated from 0.3
 rayon = "1.11"  # New - for parallel move evaluation
 smallvec = "1.15"  # Updated from 1.11
+cranelift-codegen = "0.116"
+cranelift-frontend = "0.116"
+cranelift-module = "0.116"
+cranelift-jit = "0.116"
+cranelift-native = "0.116"
 
 # Proc-macro dependencies
 syn = { version = "2.0", features = ["full", "extra-traits"] }

Cargo.toml

@@ -38,7 +38,8 @@ pub fn init() {
 
         let filter = EnvFilter::builder()
             .with_default_directive("solverforge_solver=info".parse().unwrap())
-            .from_env_lossy();
+            .from_env_lossy()
+            .add_directive("solverforge_dynamic=info".parse().unwrap());
 
         let _ = tracing_subscriber::registry()
             .with(filter)

crates/solverforge-console/src/lib.rs

@@ -156,6 +156,11 @@ impl Score for HardMediumSoftScore {
             _ => panic!("HardMediumSoftScore has 3 levels, got index {}", index),
         }
     }
+
+    #[inline]
+    fn to_scalar(&self) -> f64 {
+        self.hard as f64 * 1_000_000_000_000.0 + self.medium as f64 * 1_000_000.0 + self.soft as f64
+    }
 }
 
 impl Ord for HardMediumSoftScore {

crates/solverforge-core/src/score/hard_medium_soft.rs

@@ -121,6 +121,11 @@ impl Score for HardSoftScore {
             _ => panic!("HardSoftScore has 2 levels, got index {}", index),
         }
     }
+
+    #[inline]
+    fn to_scalar(&self) -> f64 {
+        self.hard as f64 * 1_000_000.0 + self.soft as f64
+    }
 }
 
 impl Ord for HardSoftScore {

crates/solverforge-core/src/score/hard_soft.rs

@@ -81,6 +81,11 @@ impl Score for SimpleScore {
             _ => panic!("SimpleScore has 1 level, got index {}", index),
         }
     }
+
+    #[inline]
+    fn to_scalar(&self) -> f64 {
+        self.score as f64
+    }
 }
 
 impl Ord for SimpleScore {

crates/solverforge-core/src/score/simple.rs

@@ -4,8 +4,6 @@ use std::cmp::Ordering;
 use std::fmt::{Debug, Display};
 use std::ops::{Add, Neg, Sub};
 
-use super::ScoreLevel;
-
 /// Core trait for all score types in SolverForge.
 ///
 /// Scores represent the quality of a planning solution. They are used to:
@@ -79,14 +77,28 @@ pub trait Score:
     /// Returns the absolute value of this score.
     fn abs(&self) -> Self;
 
-    /// Returns the semantic label for the score level at the given index.
-    ///
-    /// Level indices follow the same order as `to_level_numbers()`:
-    /// highest priority first.
+    /// Converts this score to a single scalar f64 for algorithms like
+    /// Simulated Annealing that need a continuous representation.
     ///
-    /// # Panics
-    /// Panics if `index >= levels_count()`.
-    fn level_label(index: usize) -> ScoreLevel;
+    /// Higher-priority levels are weighted exponentially more (10^6 per level).
+    /// Override for zero-allocation implementations on fixed-level score types.
+    #[inline]
+    fn to_scalar(&self) -> f64 {
+        let levels = self.to_level_numbers();
+        if levels.is_empty() {
+            return 0.0;
+        }
+        if levels.len() == 1 {
+            return levels[0] as f64;
+        }
+        let n = levels.len();
+        let mut scalar = 0.0f64;
+        for (i, &level) in levels.iter().enumerate() {
+            let weight = 10.0f64.powi(6 * (n - 1 - i) as i32);
+            scalar += level as f64 * weight;
+        }
+        scalar
+    }
 
     /// Compares two scores, returning the ordering.
     ///

crates/solverforge-core/src/score/traits.rs

@@ -18,5 +18,10 @@ thiserror.workspace = true
 tracing.workspace = true
 rand.workspace = true
 rand_chacha.workspace = true
+cranelift-codegen.workspace = true
+cranelift-frontend.workspace = true
+cranelift-module.workspace = true
+cranelift-jit.workspace = true
+cranelift-native.workspace = true
 
 [dev-dependencies]

crates/solverforge-dynamic/Cargo.toml

@@ -221,15 +221,7 @@ pub fn make_cross_key_a(key_expr: Expr, descriptor: DynamicDescriptor) -> DynCro
         );
     }
 
-    // Create minimal solution with only descriptor (no entities/facts).
-    // This is intentional - join keys should be stable entity attributes.
-    let minimal_solution = DynamicSolution {
-        descriptor,
-        entities: Vec::new(),
-        facts: Vec::new(),
-        score: None,
-        id_to_location: std::collections::HashMap::new(),
-    };
+    let minimal_solution = DynamicSolution::empty(descriptor);
 
     Box::new(move |entity: &DynamicEntity| {
         crate::eval::eval_entity_expr(&key_expr, &minimal_solution, entity)
@@ -293,15 +285,7 @@ pub fn make_cross_key_b(key_expr: Expr, descriptor: DynamicDescriptor) -> DynCro
         );
     }
 
-    // Create minimal solution with only descriptor (no entities/facts).
-    // This is intentional - join keys should be stable entity attributes.
-    let minimal_solution = DynamicSolution {
-        descriptor,
-        entities: Vec::new(),
-        facts: Vec::new(),
-        score: None,
-        id_to_location: std::collections::HashMap::new(),
-    };
+    let minimal_solution = DynamicSolution::empty(descriptor);
 
     Box::new(move |entity: &DynamicEntity| {
         crate::eval::eval_entity_expr(&key_expr, &minimal_solution, entity)