not a good idea to defcomputed columns, as it changes prague

Signed-off-by: F Bojarski <[email protected]>

Author: letypequividelespoubelles

rlptxrcpt/london/columns.lisp

@@ -30,8 +30,8 @@
   (IS_TOPIC         :binary@prove)
   (IS_DATA          :binary@prove)
   (LOG_ENTRY_SIZE   :i32)
-  (LOCAL_SIZE       :i32))
-  ;; (PHASE_ID         :i16) defcomputedcolumn
+  (LOCAL_SIZE       :i32)
+  (PHASE_ID         :i16))
 
 ;; aliases
 (defalias

rlptxrcpt/london/constraints.lisp

@@ -71,18 +71,15 @@
   (phase-constancy [PHASE 1] TXRCPT_SIZE))
 
 ;;    4.1.2 Global Phase Constraints    ;;
-(defcomputedcolumn (PHASE_ID :i16)
-       (+ 
-          (* 1 [PHASE 1])
-          (* 2 [PHASE 2])
-          (* 3 [PHASE 3])
-          (* 4 [PHASE 4])
-          (* 5 [PHASE 5])
+(defconstraint impose-phase-id ()
+  (eq! PHASE_ID
+       (+ (reduce +
+                  (for k [1 : 5] (* k [PHASE k])))
           (* SUBPHASE_ID_WEIGHT_IS_PREFIX IS_PREFIX)
           (* SUBPHASE_ID_WEIGHT_IS_OT IS_TOPIC)
           (* SUBPHASE_ID_WEIGHT_IS_OD IS_DATA)
           (* SUBPHASE_ID_WEIGHT_DEPTH DEPTH_1)
-          (* SUBPHASE_ID_WEIGHT_INDEX_LOCAL IS_TOPIC INDEX_LOCAL)))
+          (* SUBPHASE_ID_WEIGHT_INDEX_LOCAL IS_TOPIC INDEX_LOCAL))))
 
 (defconstraint initial-stamp (:domain {0})
   (begin (vanishes! ABS_TX_NUM)

rlptxrcpt/osaka/columns.lisp

@@ -33,8 +33,8 @@
   (IS_TOPIC         :binary@prove)
   (IS_DATA          :binary@prove)
   (LOG_ENTRY_SIZE   :i32)
-  (LOCAL_SIZE       :i32))
-  ;; (PHASE_ID         :i16) defcomputedcolumn
+  (LOCAL_SIZE       :i32)
+  (PHASE_ID         :i16))
 
 ;; aliases
 (defalias

rlptxrcpt/osaka/constraints.lisp

@@ -68,17 +68,17 @@
   (phase-constancy PHASE_1 TXRCPT_SIZE))
 
 ;;    4.1.2 Global Phase Constraints    ;;
-(defcomputedcolumn (PHASE_ID :i16)
-       (+ 
-          (* 1 PHASE_1)
+(defconstraint impose-phase-id ()
+  (eq! PHASE_ID
+       (+ (* 1 PHASE_1)
           (* 2 PHASE_2)
           (* 3 PHASE_3)
           (* 5 PHASE_5)
           (* SUBPHASE_ID_WEIGHT_IS_PREFIX IS_PREFIX)
           (* SUBPHASE_ID_WEIGHT_IS_OT IS_TOPIC)
           (* SUBPHASE_ID_WEIGHT_IS_OD IS_DATA)
           (* SUBPHASE_ID_WEIGHT_DEPTH DEPTH_1)
-          (* SUBPHASE_ID_WEIGHT_INDEX_LOCAL IS_TOPIC INDEX_LOCAL)))
+          (* SUBPHASE_ID_WEIGHT_INDEX_LOCAL IS_TOPIC INDEX_LOCAL))))
 
 (defconstraint initial-stamp (:domain {0})
   (begin (vanishes! ABS_TX_NUM)