Rename Var::reward to activity

shnarazk · Feb 6, 2025 · 3a01173 · 3a01173
1 parent d075735
commit 3a01173
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/src/assign/learning_rate.rs b/src/assign/learning_rate.rs
@@ -8,14 +8,14 @@ impl ActivityIF<VarId> for AssignStack {
     #[inline]
     fn activity(&self, vi: VarId) -> f64 {
         // self.var[vi].reward
-        VarRef(vi).reward()
+        VarRef(vi).activity()
     }
     // fn activity_slow(&self, vi: VarId) -> f64 {
     //     self.var[vi].reward_ema.get()
     // }
     fn set_activity(&mut self, vi: VarId, val: f64) {
         // self.var[vi].reward = val;
-        VarRef(vi).set_reward(val);
+        VarRef(vi).set_activity(val);
     }
     fn reward_at_analysis(&mut self, vi: VarId) {
         // self.var[vi].turn_on(FlagVar::USED);

diff --git a/src/assign/select.rs b/src/assign/select.rs
@@ -80,8 +80,8 @@ impl VarSelectIF for AssignStack {
             if VarRef(*vi).is(FlagVar::PHASE) != *b {
                 num_flipped += 1;
                 VarRef(*vi).set_flag(FlagVar::PHASE, *b);
-                VarRef(*vi).set_reward(
-                    VarRef(*vi).reward() * self.activity_decay + self.activity_anti_decay,
+                VarRef(*vi).set_activity(
+                    VarRef(*vi).activity() * self.activity_decay + self.activity_anti_decay,
                 );
                 self.update_heap(*vi);
             }

diff --git a/src/assign/trail_saving.rs b/src/assign/trail_saving.rs
@@ -24,7 +24,7 @@ impl TrailSavingIF for AssignStack {
         self.clear_saved_trail();
         if 2 <= dl {
             let lim2 = self.trail_lim[dl - 2];
-            let activity_threshold = VarRef(self.trail[lim2].vi()).reward() /* self.var[self.trail[lim2].vi()].reward */;
+            let activity_threshold = VarRef(self.trail[lim2].vi()).activity() /* self.var[self.trail[lim2].vi()].reward */;
             for i in (lim..lim2).rev() {
                 let l = self.trail[i];
                 let vi = l.vi();
@@ -42,7 +42,7 @@ impl TrailSavingIF for AssignStack {
                 // self.var[vi].reason_saved = self.var[vi].reason;
                 VarRef(vi).set_reason_saved(VarRef(vi).reason());
                 self.reward_at_unassign(vi);
-                if activity_threshold <= VarRef(vi).reward()
+                if activity_threshold <= VarRef(vi).activity()
                 /* self.var[vi].reward */
                 {
                     self.insert_heap(vi);

diff --git a/src/types/var.rs b/src/types/var.rs
@@ -20,7 +20,7 @@ pub struct Var {
     /// the `Flag`s (8 bits)
     pub(crate) flags: FlagVar,
     /// a dynamic evaluation criterion like EVSIDS or ACID.
-    pub(crate) reward: f64,
+    pub(crate) activity: f64,
     // reward_ema: Ema2,
     #[cfg(feature = "boundary_check")]
     pub propagated_at: usize,
@@ -39,7 +39,7 @@ impl Default for Var {
             #[cfg(feature = "trail_saving")]
             reason_saved: AssignReason::None,
             flags: FlagVar::empty(),
-            reward: 0.0,
+            activity: 0.0,
             // reward_ema: Ema2::new(200).with_slow(4_000),
             #[cfg(feature = "boundary_check")]
             propagated_at: 0,
@@ -71,7 +71,7 @@ impl Var {
             .collect::<Vec<_>>()
     }
     pub fn activity(&self) -> f64 {
-        self.reward
+        self.activity
     }
     pub fn update_activity(&mut self, decay: f64, reward: f64) -> f64 {
         // Note: why the condition can be broken.
@@ -82,13 +82,13 @@ impl Var {
         // 1. restart
         // 1. cancel_until -> reward_at_unassign -> assertion failed
         //
-        self.reward *= decay;
+        self.activity *= decay;
         if self.is(FlagVar::USED) {
-            self.reward += reward;
+            self.activity += reward;
             self.turn_off(FlagVar::USED);
         }
         // self.reward_ema.update(self.reward);
-        self.reward
+        self.activity
     }
 }
 

diff --git a/src/vam.rs b/src/vam.rs
@@ -51,7 +51,7 @@ impl VarActivityManager {
     }
     pub fn add_var(vi: VarId) {
         unsafe {
-            VAR_HEAP.push(OrderedProxy::new(vi, VarRef(vi).reward()));
+            VAR_HEAP.push(OrderedProxy::new(vi, VarRef(vi).activity()));
         }
     }
     pub fn remove_var(vi: VarId) {

diff --git a/src/var_vector.rs b/src/var_vector.rs
@@ -12,8 +12,8 @@ pub trait VarRefIF {
     fn set_reason(&self, value: AssignReason);
     fn reason_saved(&self) -> AssignReason;
     fn set_reason_saved(&self, value: AssignReason);
-    fn reward(&self) -> f64;
-    fn set_reward(&self, value: f64);
+    fn activity(&self) -> f64;
+    fn set_activity(&self, value: f64);
     fn update_activity(&self, decay: f64, anti_decay: f64);
     fn is(&self, f: FlagVar) -> bool;
     fn turn_on(&self, f: FlagVar);
@@ -57,7 +57,7 @@ impl VarRef {
     }
     pub fn rescale_activity(scaling: f64) {
         for i in VarRef::var_id_iter() {
-            VarRef(i).set_reward(VarRef(i).reward() * scaling);
+            VarRef(i).set_activity(VarRef(i).activity() * scaling);
         }
     }
 }
@@ -104,13 +104,13 @@ impl VarRefIF for VarRef {
         }
     }
     #[inline]
-    fn reward(&self) -> f64 {
-        unsafe { VAR_VECTOR.get_unchecked(self.0).reward }
+    fn activity(&self) -> f64 {
+        unsafe { VAR_VECTOR.get_unchecked(self.0).activity }
     }
     #[inline]
-    fn set_reward(&self, value: f64) {
+    fn set_activity(&self, value: f64) {
         unsafe {
-            VAR_VECTOR.get_unchecked_mut(self.0).reward = value;
+            VAR_VECTOR.get_unchecked_mut(self.0).activity = value;
         }
     }
     #[inline]