From 319b15d956c5f4e0f81838147efa2c991d8866dc Mon Sep 17 00:00:00 2001 From: Sergiu Ivanov Date: Wed, 25 Mar 2020 23:15:37 +0100 Subject: [PATCH] networks: Remove ppsg and ppsgb. --- example/example.org | 12 ++++++------ networks-tests.rkt | 4 ++-- networks.rkt | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example/example.org b/example/example.org index 57535de..cbf2992 100644 --- a/example/example.org +++ b/example/example.org @@ -371,7 +371,7 @@ tab #+BEGIN_SRC racket :results silent :var simple-bn=munch-sexp(simple-bn) (let* ([bn (network-form->network (unorgv simple-bn))] [bn-asyn (make-asyn-dynamics bn)]) - (dotit (ppsg (build-full-boolean-state-graph bn-asyn)))) + (dotit (pretty-print-state-graph (build-full-boolean-state-graph bn-asyn)))) #+END_SRC @@ -390,7 +390,7 @@ tab #+BEGIN_SRC racket :results silent :var simple-bn=munch-sexp(simple-bn) (let* ([bn (network-form->network (unorgv simple-bn))] [bn-asyn (make-asyn-dynamics bn)]) - (dotit (ppsgb (build-full-boolean-state-graph bn-asyn)))) + (dotit (pretty-print-boolean-state-graph (build-full-boolean-state-graph bn-asyn)))) #+END_SRC #+BEGIN_SRC dot :file dots/examplex1Irnk.svg :results raw drawer :cmd sfdp :noweb yes @@ -418,8 +418,8 @@ tab #+BEGIN_SRC racket :results silent (let* ([bn (network-form->network (unorgv simple-bn))] [bn-asyn (make-asyn-dynamics bn)] - [s0 (stb (unorgv some-state))]) - (dotit (ppsgb (dds-build-n-step-state-graph bn-asyn (set s0) 2)))) + [s0 (booleanize-state (unorgv some-state))]) + (dotit (pretty-print-boolean-state-graph (dds-build-n-step-state-graph bn-asyn (set s0) 2)))) #+END_SRC #+BEGIN_SRC dot :file dots/examplecHA6gL.svg :results raw drawer :cmd sfdp :noweb yes @@ -437,7 +437,7 @@ tab #+BEGIN_SRC racket :results silent :var simple-bn=munch-sexp(simple-bn) (let* ([bn (network-form->network (unorgv simple-bn))] [bn-asyn (make-asyn-dynamics bn)]) - (dotit (ppsgb (build-full-boolean-state-graph-annotated bn-asyn)))) + (dotit (pretty-print-boolean-state-graph (build-full-boolean-state-graph-annotated bn-asyn)))) #+END_SRC #+BEGIN_SRC dot :file dots/examplei4we6j.svg :results raw drawer :cmd sfdp :noweb yes @@ -459,7 +459,7 @@ tab #+BEGIN_SRC racket :results silent :var input-bn=munch-sexp(bn2) (let* ([bn (network-form->network (unorgv input-bn))] [bn-asyn (make-asyn-dynamics bn)]) - (dotit (ppsgb (build-full-boolean-state-graph-annotated bn-asyn)))) + (dotit (pretty-print-boolean-state-graph (build-full-boolean-state-graph-annotated bn-asyn)))) #+END_SRC #+BEGIN_SRC dot :file dots/examplehsuRqc.svg :results raw drawer :cmd dot :noweb yes diff --git a/networks-tests.rkt b/networks-tests.rkt index fcdc913..1c1b427 100644 --- a/networks-tests.rkt +++ b/networks-tests.rkt @@ -137,8 +137,8 @@ (make-state '((a . #f) (b . #t))))] [gr1 (dds-build-n-step-state-graph asyn (set s) 1)] [gr-full (dds-build-state-graph asyn (set s))] - [gr-full-pp (ppsg gr-full)] - [gr-full-ppb (ppsgb gr-full)] + [gr-full-pp (pretty-print-state-graph gr-full)] + [gr-full-ppb (pretty-print-boolean-state-graph gr-full)] [gr-complete-bool (build-full-boolean-state-graph asyn)] [gr-complete-bool-ann (build-full-boolean-state-graph-annotated asyn)]) (check-equal? (dds-step-one asyn s) (set (make-state '((a . #f) (b . #f))) diff --git a/networks.rkt b/networks.rkt index 9b350ad..5b7d473 100644 --- a/networks.rkt +++ b/networks.rkt @@ -97,7 +97,7 @@ [update-function/c contract?] [domain-mapping/c contract?]) ;; Syntax - ppsg ppsgb unorg-syn unorg-asyn) + unorg-syn unorg-asyn) ;;; =================