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.

Sign up for GitHub

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

Jump to bottom

Improve SeqN Gapply Code #160

Merged
merged 1 commit into from
Oct 11, 2023
Merged

Improve SeqN Gapply Code #160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 23 additions & 18 deletions src/seqn/seqn.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,13 @@ is capable of succesfully evaluating all compiled terms"
(id vector)
(composition (gapply (mcar morphism)
(gapply (mcadr morphism) vector)))
(parallel-seq (append (gapply (mcar morphism)
(subseq vector
0 (length (dom (mcar morphism)))))
(gapply (mcadr morphism)
(subseq vector
(length (dom (mcar morphism)))))))
(parallel-seq (let ((lng (length (dom (mcar morphism)))))
(append (gapply (mcar morphism)
(subseq vector
0 lng))
(gapply (mcadr morphism)
(subseq vector
lng)))))
(fork-seq (append vector vector))
(drop-nil (list 0))
(remove-right (butlast vector))
Expand All @@ -151,15 +152,17 @@ is capable of succesfully evaluating all compiled terms"
:initial-element 0)
vector))
(inj-size vector)
(branch-seq (if (= 0 (car vector))
(gapply (mcar morphism)
(cdr vector))
(gapply (mcadr morphism)
(cdr vector))))
(shift-front (append (cons (nth (1- (mcadr morphism))
vector)
(subseq vector 0 (1- (mcadr morphism))))
(subseq vector (mcadr morphism))))
(branch-seq (let ((cdr (cdr vector)))
(if (= 0 (car vector))
(gapply (mcar morphism)
cdr)
(gapply (mcadr morphism)
cdr))))
(shift-front (let ((mcadr (1- (mcadr morphism))))
(append (cons (nth mcadr
vector)
(subseq vector 0 mcadr))
(subseq vector (mcadr morphism)))))
(zero-bit (list 0))
(one-bit (list 1))
(seqn-add (list (+ (car vector) (cadr vector))))
Expand All @@ -170,9 +173,11 @@ is capable of succesfully evaluating all compiled terms"
(seqn-nat (list (mcadr morphism)))
(seqn-concat (list (+ (* (expt 2 (mcadr morphism)) (car vector))
(cadr vector))))
(seqn-decompose (if (>= (car vector) (expt 2 (1- (mcar morphism))))
(list 1 (- (car vector) (expt 2 (1- (mcar morphism)))))
(list 0 (car vector))))
(seqn-decompose (let ((car (car vector))
(exp (expt 2 (1- (mcar morphism)))))
(if (>= car exp)
(list 1 (- car exp))
(list 0 car))))
(seqn-eq (if (= (car vector) (cadr vector))
(list 0 0)
(list 1 0)))
Expand Down
Loading