Skip to content

Commit a7be844

Browse files
authored
FDGch03fix (#338)
1 parent 8ef614c commit a7be844

File tree

2 files changed

+29
-15
lines changed

2 files changed

+29
-15
lines changed

deps.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
dev.data-star.clojure/http-kit-malli-schemas {:mvn/version "1.0.0-RC4"}
5050
dev.data-star.clojure/ring-malli-schemas {:mvn/version "1.0.0-RC4"}
5151
;; required by mentat_collective/emmy/fdg_ch03
52-
io.github.nextjournal/clerk {:mvn/version "0.18.1158"}
52+
;; io.github.nextjournal/clerk {:mvn/version "0.18.1158"}
5353

5454
;; libraries for GIS work
5555
org.apache.sis.storage/sis-geotiff {:mvn/version "1.5"}

src/mentat_collective/emmy/fdg_ch03.clj

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,51 @@
1414
time infinite? abs ref partial =])
1515
(:require [scicloj.kindly.v4.api :as kindly]
1616
[scicloj.kindly.v4.kind :as kind]
17-
[mentat-collective.emmy.scheme :refer [define-1 let-scheme lambda] :as scheme]
17+
#_[mentat-collective.emmy.scheme :refer [define-1 let-scheme lambda] :as scheme]
1818
[civitas.repl :as repl]))
1919

2020
;; ## 3 Vector Fields and One-Form Fields
2121
;; We want a way to think about how a function varies on a manifold.
2222

2323
^:kindly/hide-code
24-
(def prod true) #_"used to check Emmy in Scittle kitchen"
24+
(def prod false) #_"used to check Emmy in Scittle kitchen"
2525

2626
^:kindly/hide-code
27-
(kind/hiccup scheme/scittle-kitchen-hiccup)
27+
(def scittle-kitchen-hiccup
28+
[:div
29+
[:script {:src "https://cdn.jsdelivr.net/npm/scittle-kitchen@0.7.30-64/dist/scittle.js"}]
30+
[:script {:src "https://cdn.jsdelivr.net/npm/scittle-kitchen@0.7.30-64/dist/scittle.emmy.js"}]
31+
[:script {:src "https://cdn.jsdelivr.net/npm/scittle-kitchen@0.7.30-64/dist/scittle.cljs-ajax.js"}]
32+
[:script {:src "https://cdn.jsdelivr.net/npm/react@18/umd/react.production.min.js", :crossorigin ""}]
33+
[:script {:src "https://cdn.jsdelivr.net/npm/react-dom@18/umd/react-dom.production.min.js", :crossorigin ""}]
34+
[:script {:src "https://cdn.jsdelivr.net/npm/scittle-kitchen@0.7.30-64/dist/scittle.reagent.js"}]
35+
[:script {:type "application/x-scittle" :src "scheme.cljc"}]])
36+
37+
^:kindly/hide-code
38+
(kind/hiccup scittle-kitchen-hiccup)
2839

2940
^:kindly/hide-code
3041
(defmacro define [& b]
3142
(list 'do
32-
(cons 'mentat-collective.emmy.scheme/define b)
43+
#_(cons 'mentat-collective.emmy.scheme/define b)
3344
(list 'kind/scittle (list 'quote (cons 'define b)))))
3445

3546
^:kindly/hide-code
3647
(define emmy-env
3748
'[emmy.env :as e :refer :all :exclude [print-expression Lagrangian-action find-path
38-
Lagrange-equations r->p
39-
R2 define-coordinates]])
49+
Lagrange-equations r->p
50+
R2 define-coordinates]])
4051

4152
^:kindly/hide-code
4253
(define emmy-vector-field
4354
'[emmy.calculus.vector-field :as vf])
4455

4556
^{:kindly/hide-code true :kindly/kind kind/hidden}
46-
(do
47-
(require emmy-env)
48-
(require emmy-vector-field))
57+
(comment
58+
(do
59+
(require emmy-env)
60+
(require emmy-vector-field))
61+
:end-comment)
4962

5063
^:kindly/hide-code
5164
(kind/scittle
@@ -56,23 +69,23 @@
5669
^:kindly/hide-code
5770
(defmacro define-coordinates [& b]
5871
(list 'do
59-
(cons 'emmy.env/define-coordinates b)
72+
#_(cons 'emmy.env/define-coordinates b)
6073
(list 'kind/scittle (list 'quote (cons 'emmy.env/define-coordinates b)))))
6174

6275
^:kindly/hide-code
6376
(define string-exp (comp str simplify))
6477

6578
^:kindly/hide-code
6679
(defn reag-comp [b]
67-
(let [server-erg (string-exp (eval b))]
80+
(let [server-erg nil #_(string-exp (eval b))]
6881
(list 'kind/reagent
6982
[:div (list 'quote
7083
(list 'let ['a (list 'string-exp b)]
7184
[:div
7285
(when (not prod)
7386
[:div
7487
[:tt 'a]
75-
[:p (list 'str (list '= server-erg 'a))]])
88+
#_[:p (list 'str (list '= server-erg 'a))]])
7689
[:tt server-erg]]))])))
7790

7891
^:kindly/hide-code
@@ -86,7 +99,7 @@
8699
'(def print-expression identity))
87100

88101
^:kindly/hide-code
89-
(def show-tex-fn (comp kind/tex emmy.expression.render/->TeX))
102+
(def show-tex-fn identity #_(comp kind/tex emmy.expression.render/->TeX))
90103

91104
^:kindly/hide-code
92105
(defmacro show-tex [e]
@@ -101,7 +114,8 @@
101114

102115
^:kindly/hide-code
103116
(defn show-expression-fn [e]
104-
(kind/tex (str "\\boxed{" (emmy.expression.render/->TeX e) "}")))
117+
e
118+
#_(kind/tex (str "\\boxed{" (emmy.expression.render/->TeX e) "}")))
105119

106120
^:kindly/hide-code
107121
(defmacro show-expression [e]

0 commit comments

Comments
 (0)