diff --git a/.github/workflows/commit_validation.yml b/.github/workflows/commit_validation.yml index eac46e6..4fef875 100644 --- a/.github/workflows/commit_validation.yml +++ b/.github/workflows/commit_validation.yml @@ -12,4 +12,4 @@ jobs: # this is to fix GIT not liking owner of the checkout dir, See https://github.com/actions/runner/issues/2033 chown -R $(id -u):$(id -g) $PWD - name: Base image - uses: docker://hephaistox/gha-automaton-optimization:2.0.4 + uses: docker://hephaistox/gha-automaton-optimization:2.0.5 diff --git a/bb.edn b/bb.edn index 347ee74..fc6a250 100644 --- a/bb.edn +++ b/bb.edn @@ -1,5 +1,5 @@ ;; The file is updated automatically -{:deps {org.clojars.hephaistox/automaton-build #:mvn{:version "1.4.7"}} +{:deps {org.clojars.hephaistox/automaton-build #:mvn{:version "2.0.0"}} :paths [] :tasks {:requires diff --git a/deps.edn b/deps.edn index 851dd0e..2b93d30 100644 --- a/deps.edn +++ b/deps.edn @@ -1,8 +1,8 @@ {:aliases - {:bb-deps {:extra-deps {org.clojars.hephaistox/automaton-build #:mvn{:version - "1.4.7"}}} - :build {:extra-deps {org.clojars.hephaistox/automaton-build #:mvn{:version - "1.4.7"}}} + {:bb-deps {:extra-deps {org.clojars.hephaistox/automaton-build + #:mvn{:version "2.0.0"}}} + :build {:extra-deps {org.clojars.hephaistox/automaton-build + #:mvn{:version "2.0.0"}}} :cljs-deps {:extra-deps {binaryage/devtools #:mvn{:version "1.0.7"} criterium/criterium {:mvn/version "0.4.6"} kixi/stats {:mvn/version "0.5.5"} @@ -20,7 +20,8 @@ :extra-paths ["test/clj" "test/cljc" "test/resources"] :jvm-opts ["-Dheph-conf=env/test/config.edn,env/test/config.edn"]} :env-development-repl - {:extra-deps {org.clojars.hephaistox/automaton-core #:mvn{:version "1.2.6"}} + {:extra-deps {org.clojars.hephaistox/automaton-core #:mvn{:version + "1.2.7"}} :extra-paths ["env/development/resources" "env/development/src/clj" "env/development/src/cljc"] @@ -41,7 +42,7 @@ "test/cljc"]}} :deps {criterium/criterium {:mvn/version "0.4.6"} kixi/stats {:mvn/version "0.5.5"} - org.clojars.hephaistox/automaton-core #:mvn{:version "1.2.6"} + org.clojars.hephaistox/automaton-core #:mvn{:version "1.2.7"} org.clojure/clojure #:mvn{:version "1.11.2"} thedavidmeister/xoroshiro128 #:mvn{:version "1.1.3"}} :paths ["src/clj" "src/cljc" "resources" "src/cljs"]} diff --git a/env/development/src/clj/automaton_optimization/repl/entry_point.clj b/env/development/src/clj/automaton_optimization/repl/entry_point.clj index 507e2ef..1d3bf06 100644 --- a/env/development/src/clj/automaton_optimization/repl/entry_point.clj +++ b/env/development/src/clj/automaton_optimization/repl/entry_point.clj @@ -4,7 +4,7 @@ [automaton-core.log :as core-log] [automaton-core.repl :as core-repl] [mount.core :as mount] - [mount.tools.graph :as graph]) + [mount.tools.graph :as mount-graph]) (:gen-class)) (defn- stub [& _args] (constantly nil)) @@ -13,6 +13,6 @@ "Main entry point for repl" [& args] (core-log/info "Start `automaton-simulation-de`") - (core-log/trace "Component dependencies: " (graph/states-with-deps)) + (core-log/trace "Component dependencies: " (mount-graph/states-with-deps)) (core-repl/start-repl args (core-repl/default-middleware) stub) (mount/start)) diff --git a/pom.xml b/pom.xml index 89f6f18..619c78d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ jar org.clojars.hephaistox automaton-optimization - 2.0.4 + 2.0.5 automaton-optimization @@ -20,7 +20,7 @@ org.clojars.hephaistox automaton-core - 1.2.6 + 1.2.7 kixi diff --git a/src/cljc/automaton_optimization/randomness.cljc b/src/cljc/automaton_optimization/randomness.cljc index 13dbc3a..3584516 100644 --- a/src/cljc/automaton_optimization/randomness.cljc +++ b/src/cljc/automaton_optimization/randomness.cljc @@ -2,7 +2,7 @@ "Randomness for optimization projects." (:require [automaton-optimization.randomness.distribution - :as opt-distribution] + :as opt-proba-distribution] [automaton-optimization.randomness.impl.distribution.factory :as opt-distribution-factory] [automaton-optimization.randomness.impl.distribution.registry @@ -97,10 +97,10 @@ (defn draw "`(draw)` returns a random value following `distribution`." - ([distribution] (opt-distribution/draw distribution)) + ([distribution] (opt-proba-distribution/draw distribution)) ([kw params] (-> (build kw params) - opt-distribution/draw))) + opt-proba-distribution/draw))) (defn distribution-registry "Returns the base registry." @@ -110,19 +110,19 @@ #_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]} (defn median "Returns the median of the distribution" - ([distribution] (opt-distribution/median distribution)) - ([kw params] (opt-distribution/median (build kw params)))) + ([distribution] (opt-proba-distribution/median distribution)) + ([kw params] (opt-proba-distribution/median (build kw params)))) #_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]} (def cumulative "Returns the cumulative probability before `p`" - opt-distribution/cumulative) + opt-proba-distribution/cumulative) #_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]} -(def minimum "Minimum" opt-distribution/minimum) +(def minimum "Minimum" opt-proba-distribution/minimum) #_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]} -(def maximum "Maximum" opt-distribution/maximum) +(def maximum "Maximum" opt-proba-distribution/maximum) #_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]} -(def quantile opt-distribution/quantile) +(def quantile opt-proba-distribution/quantile) diff --git a/src/cljc/automaton_optimization/time_based/impl/var_additive.cljc b/src/cljc/automaton_optimization/time_based/impl/var_additive.cljc index bc65310..0983e1e 100644 --- a/src/cljc/automaton_optimization/time_based/impl/var_additive.cljc +++ b/src/cljc/automaton_optimization/time_based/impl/var_additive.cljc @@ -8,8 +8,7 @@ ![Aggregate entity diagram](archi/time_based/tb_var_additive.png)" (:require - [automaton-optimization.time-based.impl.storage-strategy - :as opt-tb-storage-strategy] + [automaton-optimization.time-based.impl.storage-strategy :as opt-tb-ss] [automaton-optimization.time-based.protocol :as opt-tb-protocol])) @@ -17,14 +16,14 @@ opt-tb-protocol/TimeBased (default [_] default-value) (get-measure [_ bucket] - (if-let [val (opt-tb-storage-strategy/get-exact storage bucket)] + (if-let [val (opt-tb-ss/get-exact storage bucket)] val default-value)) (get-measures [_ buckets] (mapv #(if (nil? %) default-value %) - (opt-tb-storage-strategy/get-measures storage buckets))) + (opt-tb-ss/get-measures storage buckets))) (measure [_ bucket data] - (TbVarAdditive. (opt-tb-storage-strategy/update-date + (TbVarAdditive. (opt-tb-ss/update-date storage bucket (fn [val] diff --git a/version.edn b/version.edn index ac58ff8..9dddfd9 100644 --- a/version.edn +++ b/version.edn @@ -1,2 +1,2 @@ ;; Last generated version, note a failed push consume a number -{:version "2.0.4"} \ No newline at end of file +{:version "2.0.5"} \ No newline at end of file