Merge branch 'master' into dev

Author: tomhanika

.github/workflows/update-deps-lock.yaml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: DeterminateSystems/nix-installer-action@v4
-      - uses: DeterminateSystems/magic-nix-cache-action@v2
+      - uses: DeterminateSystems/magic-nix-cache-action@v3
       - name: Update deps-lock
         run: nix run .#deps-lock
 

README.md

@@ -95,7 +95,7 @@ would appreciate if you use the following reference.
 
 ## License
 
-Copyright ⓒ 2009—2018 Daniel Borchmann, 2018–2024 Tom Hanika
+Copyright ⓒ 2009—2018 Daniel Borchmann, 2018—2025 Tom Hanika
 
 Distributed under the Eclipse Public License.
 

project.clj

@@ -54,10 +54,11 @@
                    :dependencies [[javax.servlet/servlet-api "2.5"]
                                   [ring/ring-mock "0.4.0"]
                                   [nrepl/nrepl "1.1.2"]
-                                  [com.clojure-goes-fast/clj-async-profiler "1.2.2"]]
+                                  [com.clojure-goes-fast/clj-async-profiler "1.6.1"]
+                                  [com.taoensso/tufte "2.7.0"]]
                    :plugins [[lein-aot-order "0.1.0"]]
                    :javac-options ["-Xlint:deprecation" "-Xlint:unchecked"]
-                   :jvm-opts ["-Djdk.attach.allowAttachSelf"]}}
+                   :jvm-opts ["-Djdk.attach.allowAttachSelf=true"]}}
   :keep-non-project-classes true
   :source-paths ["src/main/clojure" "src/test/clojure"]
   :java-source-paths ["src/main/java"]

src/main/clojure/conexp/fca/random_contexts.clj

@@ -53,14 +53,25 @@
                  obj_att_nums))))
 
 
+;; (defmethod make-context-from-attribute-numbers-per-object :att-coll-obj-coll
+;;   [att obj obj_att_nums]
+;;   (let [matrix (flatten (map #(shuffle (into (vec (take % (repeat 1))) 
+;;                                              (vec (take (- (count  att) %) (repeat 0))))) obj_att_nums))]
+;;     (contexts/make-context-from-matrix
+;;      (into [] obj)
+;;      (into [] att)
+;;      matrix)))
+
 (defmethod make-context-from-attribute-numbers-per-object :att-coll-obj-coll
   [att obj obj_att_nums]
-  (let [matrix (flatten (map #(shuffle (into (vec (take % (repeat 1))) 
-                                             (vec (take (- (count  att) %) (repeat 0))))) obj_att_nums))]
+  (let [att-count (count att)
+        matrix (mapcat #(shuffle (concat (repeat % 1)
+                                    (repeat (- att-count %) 0)))
+                        obj_att_nums)]
     (contexts/make-context-from-matrix
      (into [] obj)
      (into [] att)
-     matrix)))
+     (flatten matrix))))
 
 
 (defmethod make-context-from-attribute-numbers-per-object :att-coll-obj-num
@@ -276,10 +287,12 @@
   (let [attr  (contexts/attributes ctx) 
         objects  (contexts/objects ctx)
         num_objects (count objects)
-        freq (frequencies (map #(count (contexts/object-derivation ctx [%])) objects))
-        probabilities (into {} (for [[k v] freq] [k (/ v (reduce + (vals freq)))]))
-        cat_distr (createCategoricalDistribution probabilities)]
-    (makeContext attr objects (for [i (range num_objects)] (.sample cat_distr)))))
+        freq (frequencies (pmap #(count (contexts/object-derivation ctx [%])) objects))
+        valsum (reduce + (vals freq))
+        probabilities (into {} (for [[k v] freq] [k (/ v valsum)]))
+        cat_distr (createCategoricalDistribution probabilities)
+        samples (for [i (range num_objects)] (.sample cat_distr))]
+    (makeContext attr objects samples )))
 
 
 (defn imitate-context-with-cointoss

src/main/clojure/conexp/io/lattices.clj

@@ -55,11 +55,22 @@
 (defn lattice->json
   "Returns a concept lattice, consisting of the base set and order, in json format."
   [lat]
-  {:nodes (base-set lat)
-   :edges (set-of [x y]
-                  [x (base-set lat)
-                   y (base-set lat)
-                   :when ((order lat) [x y])])})
+  (let [m (order lat)
+        bvec (vec (base-set lat))
+        m-fn (if (fn? m) m (fn [x y] (get-in m [x y])))]
+    {:nodes bvec
+     :edges
+     (persistent!
+       (reduce (fn [acc arg1]
+                 (reduce (fn [a arg2]
+                           (if (m-fn arg1 arg2)
+                             (conj! a [arg1 arg2])
+                             a))
+                         acc
+                         bvec))
+               (transient [])
+               bvec))}))
+
 
 (defn- json->concept
   "Returns a vector containing both extent and intent."

src/test/clojure/conexp/fca/fuzzy/fca_test.clj

@@ -49,7 +49,6 @@
                                 0.2 0.9 0.7 0.5 1.0 0.6,
                                 1.0 1.0 0.8 1.0 1.0 0.5]))
 
-
 (deftest test-mv-to-fuzzy
 
   (is (= (mv->fuzzy-context-nc mvctx) fctx))