get 'er done

Author: marke000

notebooks/fitting.clj

@@ -236,7 +236,7 @@
                                                     (* 2.0 (m/sq true-sigma))))))
                     noise (* 0.3 (random/rnd-normal!))]
                 {::curve/x x ::curve/y (+ true-y noise)}))
-        (range 0.0 6.1 0.2)))))
+        (mapv #(* 0.2 %) (range 31))))))
 
 ^{::clerk/visibility {:code :show :result :show}}
 (def gaussian-result (curve/fit-gaussian gaussian-data))
@@ -249,7 +249,7 @@
 ^{::clerk/visibility {:code :hide :result :hide}}
 (def gaussian-curve-data
   (let [{::curve/keys [mean norm sigma]} gaussian-result
-        x-range (range 0.0 6.1 0.05)]
+        x-range (mapv #(* 0.05 %) (range 121))]
     (mapv (fn [x]
             {:Type "Gaussian fit"
              :X x
@@ -285,7 +285,7 @@
               (let [true-y (* true-a (m/exp (- (* true-b x))))
                     noise (* 0.5 (random/rnd-normal!))]
                 {::curve/x x ::curve/y (+ true-y noise)}))
-        (range 0.0 8.1 0.3)))))
+        (mapv #(* 0.3 %) (range 27))))))
 
 ^{::clerk/visibility {:code :show :result :show}}
 (def decay-result
@@ -306,7 +306,7 @@
 ^{::clerk/visibility {:code :hide :result :hide}}
 (def decay-curve-data
   (let [[a b] (::curve/parameters decay-result)
-        x-range (range 0.0 8.1 0.1)]
+        x-range (mapv #(* 0.1 %) (range 79))]
     (mapv (fn [x] {:Type "Exponential decay fit" :X x :Y (* a (m/exp (- (* b x))))})
       x-range)))
 

notebooks/interpolation.clj

@@ -60,7 +60,7 @@
 ^{::clerk/visibility {:code :hide :result :hide}}
 (def x-samples [2.0 4.0 5.0 6.0 7.0 8.0 9.0])
 ^{::clerk/visibility {:code :hide :result :hide}}
-(def chart-range (vec (range 2.0 9.0 0.05)))
+(def chart-range (mapv #(+ 2.0 (* 0.05 %)) (range 141)))
 
 ;; ### Key API: Creating a 1D Interpolation Function
 ;;
@@ -132,7 +132,7 @@
 ;; `:polynomial` and `:barycentric-rational` can oscillate, while `:linear` is a rough approximation.
 
 ^{::clerk/visibility {:code :hide :result :hide}}
-(def chart-range-short (vec (range 2.0 6.0 0.05)))
+(def chart-range-short (mapv #(+ 2.0 (* 0.05 %)) (range 81)))
 ^{::clerk/visibility {:code :hide :result :hide}}
 (def x-samples-short [2.0 4.0 5.0 6.0])
 
@@ -166,11 +166,11 @@
 ^{::clerk/visibility {:code :hide :result :hide}}
 (defn runge-fn [x] (/ 1.0 (+ 1.0 (* 25.0 (m/sq x)))))
 ^{::clerk/visibility {:code :hide :result :hide}}
-(def runge-samples-5 (vec (range -1.0 1.01 0.5)))
+(def runge-samples-5 (mapv #(+ -1.0 (* 0.5 %)) (range 5)))
 ^{::clerk/visibility {:code :hide :result :hide}}
-(def runge-samples-11 (vec (range -1.0 1.01 0.2)))
+(def runge-samples-11 (mapv #(+ -1.0 (* 0.2 %)) (range 11)))
 ^{::clerk/visibility {:code :hide :result :hide}}
-(def runge-chart-range (vec (range -1.0 1.005 0.01)))
+(def runge-chart-range (mapv #(+ -1.0 (* 0.01 %)) (range 201)))
 ^{::clerk/visibility {:code :hide :result :hide}}
 (defn runge-original [chart-vals]
   (mapv (fn [x] {:Type "original" :X x :Y (runge-fn x)}) chart-vals))
@@ -369,7 +369,7 @@
 
 ^{::clerk/visibility {:code :hide :result :hide}}
 (def extrap-samples [3.0 4.0 5.0 6.0 7.0])
-(def extrap-chart-range (vec (range 1.0 9.0 0.05)))
+(def extrap-chart-range (mapv #(+ 1.0 (* 0.05 %)) (range 161)))
 
 ;; Extrapolation modes: `:flat`, `:linear`, or `:error` (default)
 
@@ -507,7 +507,7 @@
 ^{::clerk/visibility {:code :hide :result :hide}}
 (def hours [1 9 12 16 21])
 (def values [5 6 7 3 4])
-(def chart-hours (vec (range 0.0 24.0 0.1)))
+(def chart-hours (mapv #(* 0.1 %) (range 241)))
 
 ;; Periodic interpolation using `::period` option
 
@@ -561,7 +561,7 @@
 ^{::clerk/visibility {:code :hide :result :hide}}
 (def hours-extended [-3 1 9 12 16 21 25])
 (def values-extended [4 5 6 7 3 4 5])
-(def chart-hours-extended (vec (range -3.0 25.0 0.1)))
+(def chart-hours-extended (mapv #(+ -3.0 (* 0.1 %)) (range 281)))
 
 ^{::clerk/visibility {:code :hide :result :show} ::clerk/width :wide}
 (let [all-types [:akima :cubic :cubic-closed :cubic-hermite :linear :pchip]
@@ -668,8 +668,8 @@
 ^{::clerk/visibility {:code :hide :result :hide}}
 (def x-2d-samples [2.0 3.0 4.0 5.0 6.0])
 (def y-2d-samples [18.0 20.0 21.0 23.0 26.0 45.0])
-(def chart-x-2d (vec (range 2.0 6.0 0.1)))
-(def chart-y-2d (vec (range 18.0 45.0 0.5)))
+(def chart-x-2d (mapv #(+ 2.0 (* 0.1 %)) (range 41)))
+(def chart-y-2d (mapv #(+ 18.0 (* 0.5 %)) (range 55)))
 
 ^{::clerk/visibility {:code :hide :result :hide}}
 (defn heatmap-data
@@ -876,8 +876,8 @@
 ;; We can visualize a 2D slice through the 3D interpolation (fixing z = 1.5).
 
 ^{::clerk/visibility {:code :hide :result :hide}}
-(def chart-x-3d (vec (range 1.0 4.0 0.1)))
-(def chart-y-3d (vec (range 1.0 4.0 0.1)))
+(def chart-x-3d (mapv #(+ 1.0 (* 0.1 %)) (range 31)))
+(def chart-y-3d (mapv #(+ 1.0 (* 0.1 %)) (range 31)))
 (def fixed-z 1.5)
 
 ;; ### 3D Grid Interpolation API
@@ -958,8 +958,8 @@
   (mapv (fn [[x y]] (scattered-fn x y)) scattered-points))
 
 ^{::clerk/visibility {:code :hide :result :hide}}
-(def scattered-chart-x (vec (range 0.0 4.0 0.1)))
-(def scattered-chart-y (vec (range 0.0 4.0 0.1)))
+(def scattered-chart-x (mapv #(* 0.1 %) (range 41)))
+(def scattered-chart-y (mapv #(* 0.1 %) (range 41)))
 
 ;; ### Scattered Data: Natural Neighbor API
 
@@ -1183,8 +1183,8 @@
 (def station-temps (mapv (fn [[_ _ t]] t) weather-stations))
 
 ^{::clerk/visibility {:code :hide :result :hide}}
-(def lat-range (vec (range 25.0 50.0 0.5)))
-(def lon-range (vec (range -125.0 -70.0 1.0)))
+(def lat-range (mapv #(+ 25.0 (* 0.5 %)) (range 51)))
+(def lon-range (mapv #(+ -125.0 %) (range 56)))
 
 ;; ### Temperature Interpolation Across the US
 ;;