Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implementation of the HUB / MXP interface bug fix #468

Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion mxp/columns.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@
(LIN_COST :i64)
(GAS_MXP :i64)
(EXPANDS :binary@prove)
(MTNTOP :binary@prove))
(T4MTNTOP :binary@prove)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a typo here.

(SIZE_1_NONZERO_NO_MXPX :binary)
(SIZE_2_NONZERO_NO_MXPX :binary))

(defalias
S1NZNOMXPX SIZE_1_NONZERO_NO_MXPX
S2NZNOMXPX SIZE_2_NONZERO_NO_MXPX)



56 changes: 45 additions & 11 deletions mxp/constraints.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -105,21 +105,55 @@

;;;;;;;;;;;;;;;;;;;;;;
;; ;;
;; 2.5 MTNTOP ;;
;; 2.5 T4MTNTOP ;;
;; ;;
;;;;;;;;;;;;;;;;;;;;;;
(defconstraint setting-mtntop ()
(if-zero [MXP_TYPE 4]
(vanishes! MTNTOP) ;; TODO: make this debug
(begin (if-not-zero MXPX
(vanishes! MTNTOP)
(if-zero SIZE_1_LO
(vanishes! MTNTOP)
(eq! MTNTOP 1))))))

(begin
(debug (is-binary T4MTNTOP))
(debug (if-zero [MXP_TYPE 4]
(vanishes! T4MTNTOP)))
(if-not-zero MXPX
(vanishes! T4MTNTOP))
(if-not-zero [MXP_TYPE 4]
(if-zero MXPX
(if-zero SIZE_1_LO
(vanishes! T4MTNTOP)
(eq! T4MTNTOP 1))))))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;;
;; 2.6 The S1NZNOMXPX and S2NZNOMXPX flags ;;
;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(defconstraint setting-s1nznomp-s2nznomp ()
(begin
(debug (is-binary S1NZNOMXPX))
(debug (is-binary S2NZNOMXPX))
(debug (counter-constancy CT S1NZNOMXPX))
(debug (counter-constancy CT S2NZNOMXPX))
(if-not-zero MXPX
(begin (vanishes! S1NZNOMXPX)
(vanishes! S2NZNOMXPX))
(begin (if-not-zero SIZE_1_LO
(eq! S1NZNOMXPX 1))
(if-not-zero SIZE_1_HI
(eq! S1NZNOMXPX 1))
(if-zero SIZE_1_LO
(if-zero SIZE_1_HI
(vanishes! S1NZNOMXPX)))
(if-not-zero SIZE_2_LO
(eq! S2NZNOMXPX 1))
(if-not-zero SIZE_2_HI
(eq! S2NZNOMXPX 1))
(if-zero SIZE_2_LO
(if-zero SIZE_2_HI
(vanishes! S2NZNOMXPX)))))))

;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;;
;; 2.5 heartbeat ;;
;; 2.7 heartbeat ;;
;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;
(defconstraint first-row (:domain {0})
Expand Down Expand Up @@ -168,7 +202,7 @@

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;;
;; 2.5 Byte decompositions ;;
;; 2.8 Byte decompositions ;;
;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defconstraint byte-decompositions ()
Expand Down
Loading