Remove remaining instances of map->Input

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

@@ -158,7 +158,8 @@
  :alignments])
  {:keys [override-seed
  select-agents]} options
- input (cond-> (or (:input sim-options) (input/map->Input sim-options))
+ input (cond-> (or (:input sim-options)
+ (dissoc sim-options :input))
  override-seed
  (assoc-in [:parameters :seed]
  (if (= -1 override-seed)

src/dev/bench.clj

@@ -17,11 +17,10 @@
 
 (comment
  (def input
- (input/map->Input
- {:profiles [(input/from-location :profile :json "dev-resources/bench/calibration.jsonld")]
- :personae (input/from-location :personae :json "dev-resources/bench/actors.json")
- :alignments (input/from-location :alignments :json "dev-resources/bench/alignments.json")
- :parameters (input/from-location :parameters :json "dev-resources/bench/params.json")}))
+ {:profiles [(input/from-location :profile :json "dev-resources/bench/calibration.jsonld")]
+ :personae-array [(input/from-location :personae :json "dev-resources/bench/actors.json")]
+ :alignments (input/from-location :alignments :json "dev-resources/bench/alignments.json")
+ :parameters (input/from-location :parameters :json "dev-resources/bench/params.json")})
 
  (c/with-progress-reporting
  (c/quick-bench (do (doall (take 1000 (sim/sim-seq input)))

src/server/com/yetanalytics/datasim/server.clj

@@ -42,7 +42,7 @@
  [input]
  ;; Uses multipart message for the request.
  ;; Read in each part of the input file, and convert into EDN
- (let [data  {:profiles (sinput/from-location :profiles :json
+ (let [sim-input {:profiles (sinput/from-location :profiles :json
  (get-stream input "profiles"))
  :personae-array (sinput/from-location :personae-array :json
  (get-stream input "personae-array"))
@@ -53,7 +53,6 @@
  send-to-lrs (if-let [send-to-lrs (get input "send-to-lrs")]
  (read-string send-to-lrs)
  false)
- sim-input (sinput/map->Input data)
  endpoint (get input "lrs-endpoint")
  api-key (get input "api-key")
  api-secret-key (get input "api-secret-key")]