Refactor and rename add-defaults fn

src/cli/com/yetanalytics/datasim/main.clj

@@ -61,10 +61,7 @@
                 [(partial input/validate-throw :parameters)
                  "Failed to validate Parameters."]
                 [])
-    ;; TODO: it looks like, when the validation is skipped, a simple empty
-    ;; default doesn't work here, as the full input spec fails.
-    ;; For now we just hack it by calling the defaults fn directly.
-    :default (params/add-defaults {})]
+    :default (params/apply-defaults)]
 
    ["-i" "--input URI" "Combined Simulation input"
     :id :input

src/main/com/yetanalytics/datasim/input.clj

@@ -26,7 +26,7 @@
 ;; alignments input vector, and the inner vector associated with each actor.
 ;; Find separate names for each.
 (s/def ::alignments
-  ::alignments/alignments-vector)
+  ::alignments/alignment-vector)
 
 (s/def ::parameters
   ::params/parameters)
@@ -76,7 +76,7 @@
 
 (defmethod from-location [:input :json] [_ _ location]
   (-> (dio/read-json-location location)
-      (update :parameters params/add-defaults)))
+      (update :parameters params/apply-defaults)))
 
 (defmethod from-location [:profile :json] [_ _ location]
   (dio/read-json-location location))
@@ -98,7 +98,7 @@
 
 (defmethod from-location [:parameters :json] [_ _ location]
   (->> (dio/read-json-location location)
-       params/add-defaults))
+       params/apply-defaults))
 
 ;; Write to file
 

src/main/com/yetanalytics/datasim/input/parameters.clj

@@ -5,6 +5,7 @@
             [xapi-schema.spec   :as xs]
             [com.yetanalytics.pan.objects.profile :as prof]
             [com.yetanalytics.pan.objects.pattern :as pat]
+            [com.yetanalytics.datasim.random      :as random]
             [com.yetanalytics.datasim.util.errors :as errs])
   (:import [clojure.lang ExceptionInfo]
            [java.time.zone ZoneRulesException]
@@ -99,13 +100,17 @@
 ;; Defaults
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defn add-defaults
-  "Generate defualts"
-  [{:keys [start from timezone seed] :as params}]
-  (merge
-   params
-   (let [start (or start (.toString (Instant/now)))]
-     {:start    start
-      :from     (or from start)
-      :timezone (or timezone "UTC")
-      :seed     (or seed (.nextLong (Random.)))})))
+(defn apply-defaults
+  "Generate defaults and apply them to the existing `params` map. If no
+   `params` is provided, simply generate the default map with the current
+   time and a random seed."
+  ([]
+   (apply-defaults {}))
+  ([{:keys [start from timezone seed] :as params}]
+   (merge
+    params
+    (let [start (or start (.toString (Instant/now)))]
+      {:start    start
+       :from     (or from start)
+       :timezone (or timezone "UTC")
+       :seed     (or seed (random/rand-long (Random.)))}))))