diff --git a/src/main/clojure/conexp/api/namespace.clj b/src/main/clojure/conexp/api/namespace.clj index 8a5a8b13d..bb231a456 100644 --- a/src/main/clojure/conexp/api/namespace.clj +++ b/src/main/clojure/conexp/api/namespace.clj @@ -12,7 +12,8 @@ conexp.layouts.freese conexp.layouts.layered conexp.layouts.dim-draw - conexp.api.shorthands)) + conexp.api.shorthands + clojure.set)) ;;; @@ -24,7 +25,8 @@ conexp.layouts.freese conexp.layouts.layered conexp.layouts.dim-draw - conexp.api.shorthands])) + conexp.api.shorthands + clojure.set])) ;; basic set operations (def functions (concat diff --git a/src/main/clojure/conexp/base.clj b/src/main/clojure/conexp/base.clj index eb7a25b39..f4e700d9f 100644 --- a/src/main/clojure/conexp/base.clj +++ b/src/main/clojure/conexp/base.clj @@ -9,7 +9,9 @@ (ns conexp.base "Basic definitions for conexp-clj." (:require [clojure.math.combinatorics :as comb] - [clojure.java.io :as io])) + [clojure.java.io :as io] + [clojure.set :refer [difference union subset? intersection]] + [clojure.math.numeric-tower :as nt])) ;;; def macros, inspired and partially copied from clojure.contrib.def @@ -77,24 +79,24 @@ metadata (as provided by def) merged into the metadata of the original." (last dforms))))) ;;; Namespace tools -(defn immigrate - "Create a public var in this namespace for each public var in the - namespaces named by ns-names. The created vars have the same name, root - binding, and metadata as the original except that their :ns metadata - value is this namespace. - - This function is literally copied from the clojure.contrib.ns-utils library." - [& ns-names] - (doseq [ns ns-names] - (require ns) - (doseq [[sym, ^clojure.lang.Var var] (ns-publics ns)] - (let [sym (with-meta sym (assoc (meta var) :ns *ns*))] - (if (.hasRoot var) - (intern *ns* sym (.getRawRoot var)) - (intern *ns* sym)))))) - -(immigrate 'clojure.set - 'clojure.math.numeric-tower) +;; (defn immigrate +;; "Create a public var in this namespace for each public var in the +;; namespaces named by ns-names. The created vars have the same name, root +;; binding, and metadata as the original except that their :ns metadata +;; value is this namespace. + +;; This function is literally copied from the clojure.contrib.ns-utils library." +;; [& ns-names] +;; (doseq [ns ns-names] +;; (require ns) +;; (doseq [[sym, ^clojure.lang.Var var] (ns-publics ns)] +;; (let [sym (with-meta sym (assoc (meta var) :ns *ns*))] +;; (if (.hasRoot var) +;; (intern *ns* sym (.getRawRoot var)) +;; (intern *ns* sym)))))) + +;; (immigrate 'clojure.set +;; 'clojure.math.numeric-tower) ;;; Version @@ -586,7 +588,7 @@ metadata (as provided by def) merged into the metadata of the original." and returns double otherwise." [a b] (if (not (and (integer? a) (integer? b))) - (clojure.math.numeric-tower/expt a b) + (nt/expt a b) (let [^clojure.lang.BigInt a (bigint a), b (long b)] (if (< b 0) diff --git a/src/main/clojure/conexp/fca/causal_implications.clj b/src/main/clojure/conexp/fca/causal_implications.clj index 386288a44..e25ca969e 100644 --- a/src/main/clojure/conexp/fca/causal_implications.clj +++ b/src/main/clojure/conexp/fca/causal_implications.clj @@ -5,7 +5,7 @@ [conexp.io.contexts :refer :all] [conexp.fca.contexts :refer :all] [conexp.fca.implications :refer :all] - [clojure.set :as set])) + [clojure.set :refer [difference union subset? intersection]])) ;For a full Explanation of the Concepts refer to *Mining Causal Association Rules* ;https://www.researchgate.net/publication/262240022_Mining_Causal_Association_Rules @@ -26,9 +26,9 @@ (and (subset? premise b-attributes) (not (subset? premise a-attributes)))) ;check whether controlled variables have same realizations in both objects (subset? controlled-variables - (set/union (set/intersection a-attributes b-attributes) - (set/intersection (set/difference controlled-variables a-attributes) - (set/difference controlled-variables b-attributes))))))) + (union (intersection a-attributes b-attributes) + (intersection (difference controlled-variables a-attributes) + (difference controlled-variables b-attributes))))))) (defn find-matched-record-pair [ctx impl controlled-variables objs-considered a] "Searches objs-considered for an object that forms a matched record pair with a, @@ -47,13 +47,13 @@ (let [objs (objects ctx)] (filter seq (reduce (fn [present-objs new-obj] - (if (contains? (reduce set/union present-objs) new-obj) + (if (contains? (reduce union present-objs) new-obj) present-objs (conj present-objs (find-matched-record-pair ctx impl controlled-variables - (set/difference objs (reduce set/union present-objs)) + (difference objs (reduce union present-objs)) new-obj)))) #{} objs)))) @@ -103,10 +103,10 @@ "Used to compute the bounds of the confidence interval within the confidence-interval method. Computes the upper bound if + is supplied as op, lower bound if - is supplied." (Math/exp (op (Math/log odds-ratio) - (* zconf (Math/sqrt (+ (/ 1 (absolute-support ctx [(set/union premise conclusion) #{}])) + (* zconf (Math/sqrt (+ (/ 1 (absolute-support ctx [(union premise conclusion) #{}])) (/ 1 (absolute-support ctx [premise conclusion])) (/ 1 (absolute-support ctx [conclusion premise])) - (/ 1 (absolute-support ctx [#{} (set/union premise conclusion)])))))))) + (/ 1 (absolute-support ctx [#{} (union premise conclusion)])))))))) (defn confidence-interval [ctx impl odds-ratio zconf] "Computes the confidence interval of the implication. odds-ratio is the regular odds ratio of @@ -180,9 +180,9 @@ confidence interval is greather than 1." (let [premise (premise impl) conclusion (conclusion impl) - E (reduce set/union (exclusive-variables ctx premise thresh)) - controlled-variables (set/difference (attributes ctx) - (set/union conclusion irrelevant-vars E premise)) + E (reduce union (exclusive-variables ctx premise thresh)) + controlled-variables (difference (attributes ctx) + (union conclusion irrelevant-vars E premise)) fair-data (fair-data-set ctx impl controlled-variables) fair-odds (fair-odds-ratio ctx impl fair-data)] @@ -217,8 +217,8 @@ (causal-association-rule-discovery ctx ;context #{} ;current causal rules - (set/difference frequent-vars #{response-var}) ;frequent single variables - (for [x (set/difference frequent-vars #{response-var})] #{x}) ;itemsets of the current iteration + (difference frequent-vars #{response-var}) ;frequent single variables + (for [x (difference frequent-vars #{response-var})] #{x}) ;itemsets of the current iteration ivars ;irrelevant variables in respect to response-var min-lsupp ;minimum local support 0 ;counter, counts up to max-length @@ -237,9 +237,9 @@ (causal-association-rule-discovery ctx - (set/union rule-set new-causal-rules) + (union rule-set new-causal-rules) variables - (set/difference (filter #(> (local-support ctx (->Implication #{%} #{response-var})) min-lsupp) new-item-sets) + (difference (filter #(> (local-support ctx (->Implication #{%} #{response-var})) min-lsupp) new-item-sets) (find-redundant ctx current new-item-sets response-var));filter item sets ivars min-lsupp diff --git a/src/main/clojure/conexp/fca/concept_transform.clj b/src/main/clojure/conexp/fca/concept_transform.clj index e127ac323..3a3deb5cf 100644 --- a/src/main/clojure/conexp/fca/concept_transform.clj +++ b/src/main/clojure/conexp/fca/concept_transform.clj @@ -9,7 +9,8 @@ (ns conexp.fca.concept-transform (:require [conexp.base :refer :all] [conexp.fca.contexts :refer :all] - [conexp.fca.cover :refer :all])) + [conexp.fca.cover :refer :all] + [clojure.set :refer [difference union subset? intersection]])) diff --git a/src/main/clojure/conexp/fca/contexts.clj b/src/main/clojure/conexp/fca/contexts.clj index 36e6b43ed..1bb7a4f95 100644 --- a/src/main/clojure/conexp/fca/contexts.clj +++ b/src/main/clojure/conexp/fca/contexts.clj @@ -9,7 +9,9 @@ (ns conexp.fca.contexts "Provides the implementation of formal contexts and functions on them." (:require [clojure.core.reducers :as r] - [conexp.base :refer :all])) + [clojure.set :refer [difference intersection union subset?]] + [conexp.base :refer :all] + )) ;;; diff --git a/src/main/clojure/conexp/fca/cover.clj b/src/main/clojure/conexp/fca/cover.clj index 5907d801b..47d4c08c7 100644 --- a/src/main/clojure/conexp/fca/cover.clj +++ b/src/main/clojure/conexp/fca/cover.clj @@ -19,7 +19,8 @@ to-binary-matrix bitwise-context-attribute-closure]] [clojure.core.reducers :as r] - [clojure.core.async :refer [ lattice diff --git a/src/main/clojure/conexp/fca/implications.clj b/src/main/clojure/conexp/fca/implications.clj index e560d1a46..8b2e9625b 100644 --- a/src/main/clojure/conexp/fca/implications.clj +++ b/src/main/clojure/conexp/fca/implications.clj @@ -12,7 +12,9 @@ [conexp.base :refer :all] [conexp.math.algebra :refer :all] [conexp.fca.contexts :refer :all] - [clojure.set :as set])) + [clojure.set :refer [difference union subset? intersection]] + [clojure.math.numeric-tower :as nt] + )) ;;; @@ -604,15 +606,15 @@ "Computes the confidence of an implication using the absolute-support method." [ctx impl] (let [premise (premise impl) conclusion (conclusion impl)] - (/ (absolute-support ctx [(set/union premise conclusion) #{}]) + (/ (absolute-support ctx [(union premise conclusion) #{}]) (absolute-support ctx [premise #{}])))) (defn odds-ratio "Computes the odds ratio of an implication using the asupp method." [ctx impl] (let [premise (premise impl) conclusion (conclusion impl)] - (/ (* (absolute-support ctx [(set/union premise conclusion) #{}]) - (absolute-support ctx [#{} (set/union premise conclusion)])) + (/ (* (absolute-support ctx [(union premise conclusion) #{}]) + (absolute-support ctx [#{} (union premise conclusion)])) (* (absolute-support ctx [premise conclusion]) (absolute-support ctx [conclusion premise])) ))) @@ -621,7 +623,7 @@ "Computes the local support of an implication by dividing the support of the implication by the support of its conclusion. Uses the absolute-support function." (let [premise (premise impl) conclusion (conclusion impl)] - (/ (absolute-support ctx [(set/union premise conclusion) #{}]) + (/ (absolute-support ctx [(union premise conclusion) #{}]) (absolute-support ctx [conclusion #{}])))) (defn- frequent-itemsets @@ -812,7 +814,7 @@ (learn-implications-by-queries (attributes ctx) intent? (fn [implications] - (let [nr-iter (ceil (* (/ ε) (+ (swap! iter-counter inc) + (let [nr-iter (nt/ceil (* (/ ε) (+ (swap! iter-counter inc) (/ (Math/log (/ δ)) (Math/log 2)))))] (or (some (fn [test-set] diff --git a/src/main/clojure/conexp/fca/incremental_ganter.clj b/src/main/clojure/conexp/fca/incremental_ganter.clj index d98c63234..64ead8cdd 100644 --- a/src/main/clojure/conexp/fca/incremental_ganter.clj +++ b/src/main/clojure/conexp/fca/incremental_ganter.clj @@ -13,7 +13,8 @@ https://link.springer.com/article/10.1007/s10472-007-9057-2 " (:require [conexp.base :refer :all] [conexp.fca.implications :refer :all] - [conexp.fca.contexts :refer :all])) + [conexp.fca.contexts :refer :all] + [clojure.set :refer [difference union subset? intersection]])) ;;; diff --git a/src/main/clojure/conexp/fca/lattices.clj b/src/main/clojure/conexp/fca/lattices.clj index 5312e146c..d263ab82c 100644 --- a/src/main/clojure/conexp/fca/lattices.clj +++ b/src/main/clojure/conexp/fca/lattices.clj @@ -12,6 +12,7 @@ conexp.math.algebra conexp.fca.contexts conexp.fca.posets) + (:require [clojure.set :refer [difference union subset? intersection]]) (:gen-class)) ;;; Datastructure @@ -466,7 +467,7 @@ (let [lat-join (sup lat) lat-meet (inf lat)] (loop [X generators] - (let [X-new (clojure.set/union (into #{} (for [a X b X] (lat-join a b))) + (let [X-new (union (into #{} (for [a X b X] (lat-join a b))) (into #{} (for [a X b X] (lat-meet a b))))] (if (= X X-new) (make-lattice X lat-meet lat-join) (recur X-new))))) diff --git a/src/main/clojure/conexp/fca/many_valued_contexts.clj b/src/main/clojure/conexp/fca/many_valued_contexts.clj index 56744a482..f67931414 100644 --- a/src/main/clojure/conexp/fca/many_valued_contexts.clj +++ b/src/main/clojure/conexp/fca/many_valued_contexts.clj @@ -8,7 +8,8 @@ (ns conexp.fca.many-valued-contexts "Many-Valued-Contexts and some functions for scaling." - (:require [conexp.base :refer :all] + (:require [clojure.set :refer [difference union subset? intersection]] + [conexp.base :refer :all] [conexp.fca.contexts :refer :all])) ;;; diff --git a/src/main/clojure/conexp/fca/metrics.clj b/src/main/clojure/conexp/fca/metrics.clj index 6068d1650..166c0266e 100644 --- a/src/main/clojure/conexp/fca/metrics.clj +++ b/src/main/clojure/conexp/fca/metrics.clj @@ -28,7 +28,8 @@ bitwise-attribute-derivation concepts]] [implications :refer :all] [lattices :refer [inf sup lattice-base-set make-lattice concept-lattice lattice-order]]] - [conexp.math.util :refer [eval-polynomial binomial-coefficient]]) + [conexp.math.util :refer [eval-polynomial binomial-coefficient]] + [clojure.set :refer [difference union subset? intersection]]) (:import [conexp.fca.lattices Lattice] [java.util ArrayList BitSet])) diff --git a/src/main/clojure/conexp/fca/more.clj b/src/main/clojure/conexp/fca/more.clj index cf1c57d0a..da2dd14f1 100644 --- a/src/main/clojure/conexp/fca/more.clj +++ b/src/main/clojure/conexp/fca/more.clj @@ -10,6 +10,7 @@ "More on FCA." (:require [conexp.base :refer :all] [clojure.core.reducers :as r] + [clojure.set :refer [difference union subset? intersection]] [conexp.fca [contexts :refer :all] [exploration :refer :all] diff --git a/src/main/clojure/conexp/fca/posets.clj b/src/main/clojure/conexp/fca/posets.clj index c93be4897..d26e37bf0 100644 --- a/src/main/clojure/conexp/fca/posets.clj +++ b/src/main/clojure/conexp/fca/posets.clj @@ -7,7 +7,8 @@ ;; You must not remove this notice, or any other, from this software. (ns conexp.fca.posets - (:require [conexp.base :refer :all] + (:require [clojure.set :refer [union difference subset?]] + [conexp.base :refer :all] [conexp.math.algebra :refer :all] [conexp.fca.contexts :refer :all])) diff --git a/src/main/clojure/conexp/fca/protoconcepts.clj b/src/main/clojure/conexp/fca/protoconcepts.clj index e6d429712..95f328c25 100644 --- a/src/main/clojure/conexp/fca/protoconcepts.clj +++ b/src/main/clojure/conexp/fca/protoconcepts.clj @@ -13,7 +13,9 @@ [conexp.math.algebra :refer :all] [conexp.fca.contexts :refer :all] [conexp.fca.lattices :refer :all] - [conexp.fca.posets :refer :all])) + [conexp.fca.posets :refer :all] + [clojure.set :refer [difference union subset? intersection]] + )) (deftype Protoconcepts [base-set order-function] Object diff --git a/src/main/clojure/conexp/fca/random_contexts.clj b/src/main/clojure/conexp/fca/random_contexts.clj index a4ef21a2e..397b6e28f 100644 --- a/src/main/clojure/conexp/fca/random_contexts.clj +++ b/src/main/clojure/conexp/fca/random_contexts.clj @@ -4,7 +4,7 @@ [conexp.base :refer [set-of exists forall => defalias]] [conexp.fca.contexts :as contexts] [clojure.set :refer [subset? difference union intersection select]] - [clojure.math.numeric-tower :refer :all] + [clojure.math.numeric-tower :refer [expt]] [clojure.math.combinatorics :refer [cartesian-product]] ) (:import [org.apache.commons.math3.distribution diff --git a/src/main/clojure/conexp/fca/smeasure.clj b/src/main/clojure/conexp/fca/smeasure.clj index 4c0b6033c..3cba71fa1 100644 --- a/src/main/clojure/conexp/fca/smeasure.clj +++ b/src/main/clojure/conexp/fca/smeasure.clj @@ -16,6 +16,7 @@ [clojure.math.combinatorics :as comb] [loom.graph :as lg] [loom.alg :as la] [clojure.core.reducers :as r] + [clojure.set :refer [difference union subset? intersection]] [conexp.fca.implications :refer :all])) (defprotocol Smeasure diff --git a/src/main/clojure/conexp/gui/editors/context_editor/context_editor.clj b/src/main/clojure/conexp/gui/editors/context_editor/context_editor.clj index db94867a8..2e8c1aacb 100644 --- a/src/main/clojure/conexp/gui/editors/context_editor/context_editor.clj +++ b/src/main/clojure/conexp/gui/editors/context_editor/context_editor.clj @@ -16,7 +16,8 @@ [conexp.gui.editors.context-editor.table-control :refer :all] [conexp.gui.editors.context-editor.widgets :refer :all] [conexp.gui.util :refer :all] - [seesaw.core :refer [button toolbar top-bottom-split]]) + [seesaw.core :refer [button toolbar top-bottom-split]] + [clojure.set :refer [difference union subset? intersection]]) (:import [java.awt.event ActionEvent KeyEvent] [javax.swing Box JTable KeyStroke])) diff --git a/src/main/clojure/conexp/gui/editors/context_editor/table_control.clj b/src/main/clojure/conexp/gui/editors/context_editor/table_control.clj index 0682b4600..867f20ec6 100644 --- a/src/main/clojure/conexp/gui/editors/context_editor/table_control.clj +++ b/src/main/clojure/conexp/gui/editors/context_editor/table_control.clj @@ -12,7 +12,8 @@ (:require [clojure.string :refer [split split-lines]] [conexp.base :refer :all] [conexp.gui.editors.context-editor.widgets :refer :all] - [conexp.gui.util :refer :all]) + [conexp.gui.util :refer :all] + [clojure.set :refer [difference union subset? intersection join map-invert]]) (:import [java.awt.event ActionEvent ActionListener InputEvent KeyEvent MouseEvent] java.awt.Point [javax.swing AbstractAction DefaultCellEditor JComponent JScrollPane JTable JTextField KeyStroke] diff --git a/src/main/clojure/conexp/io/contexts.clj b/src/main/clojure/conexp/io/contexts.clj index 4f44212ec..c27cfff7f 100644 --- a/src/main/clojure/conexp/io/contexts.clj +++ b/src/main/clojure/conexp/io/contexts.clj @@ -18,7 +18,8 @@ [clojure.data.json :as json] [json-schema.core :as json-schema] [clojure.data.csv :as csv] - [clojure.java.io :as io]) + [clojure.java.io :as io] + [clojure.set :refer [difference union]]) (:import [java.io PushbackReader])) diff --git a/src/main/clojure/conexp/io/latex.clj b/src/main/clojure/conexp/io/latex.clj index b654056bd..28cec7d85 100644 --- a/src/main/clojure/conexp/io/latex.clj +++ b/src/main/clojure/conexp/io/latex.clj @@ -12,7 +12,8 @@ [conexp.fca.contexts :only (objects attributes incidence)] conexp.fca.lattices conexp.fca.many-valued-contexts - [conexp.layouts.base :only (positions connections nodes inf-irreducibles sup-irreducibles annotation valuations)])) + [conexp.layouts.base :only (positions connections nodes inf-irreducibles sup-irreducibles annotation valuations)]) + (:require [clojure.set :refer [difference union subset? intersection]])) ;;; diff --git a/src/main/clojure/conexp/io/layouts.clj b/src/main/clojure/conexp/io/layouts.clj index 9528c6915..4e2cf18c0 100644 --- a/src/main/clojure/conexp/io/layouts.clj +++ b/src/main/clojure/conexp/io/layouts.clj @@ -15,7 +15,8 @@ conexp.layouts.util conexp.layouts.base) (:require clojure.string - [clojure.data.json :as json]) + [clojure.data.json :as json] + [clojure.set :refer [difference union subset? intersection map-invert]]) (:import [java.io PushbackReader])) ;;; Input format dispatch diff --git a/src/main/clojure/conexp/io/smeasure.clj b/src/main/clojure/conexp/io/smeasure.clj index f6f213fc5..b79e34e7f 100644 --- a/src/main/clojure/conexp/io/smeasure.clj +++ b/src/main/clojure/conexp/io/smeasure.clj @@ -15,7 +15,8 @@ [conexp.layouts.base :refer [positions nodes inf-irreducibles sup-irreducibles connections annotation]] conexp.layouts.dim-draw - conexp.io.latex)) + conexp.io.latex) + (:require [clojure.set :refer [difference union subset? intersection]])) ;;; Smeasure diff --git a/src/main/clojure/conexp/io/util.clj b/src/main/clojure/conexp/io/util.clj index 4d5035c77..5f237adf1 100644 --- a/src/main/clojure/conexp/io/util.clj +++ b/src/main/clojure/conexp/io/util.clj @@ -8,7 +8,8 @@ (ns conexp.io.util (:use conexp.base) - (:require [clojure.java.io :as io])) + (:require [clojure.java.io :as io] + [clojure.set :refer [intersection]])) ;;; diff --git a/src/main/clojure/conexp/layouts/base.clj b/src/main/clojure/conexp/layouts/base.clj index 3756149c9..50d49a1f2 100644 --- a/src/main/clojure/conexp/layouts/base.clj +++ b/src/main/clojure/conexp/layouts/base.clj @@ -12,7 +12,9 @@ conexp.math.algebra conexp.fca.lattices conexp.fca.posets - clojure.pprint)) + clojure.pprint) + (:require + [clojure.set :refer [difference subset? superset? intersection]])) ;;; diff --git a/src/main/clojure/conexp/layouts/dim_draw.clj b/src/main/clojure/conexp/layouts/dim_draw.clj index cc83bd360..3950c6f3e 100644 --- a/src/main/clojure/conexp/layouts/dim_draw.clj +++ b/src/main/clojure/conexp/layouts/dim_draw.clj @@ -6,7 +6,8 @@ [conexp.util.graph :refer :all] [conexp.layouts.base :as lay] [conexp.base :exclude [transitive-closure] :refer :all] - [rolling-stones.core :as sat :refer :all]) + [rolling-stones.core :as sat :refer :all] + [clojure.set :refer [difference union subset? intersection]]) (:import [org.dimdraw Bipartite])) (defn in-odd-cycle? diff --git a/src/main/clojure/conexp/math/sampling.clj b/src/main/clojure/conexp/math/sampling.clj index 20be34458..8e02d67eb 100644 --- a/src/main/clojure/conexp/math/sampling.clj +++ b/src/main/clojure/conexp/math/sampling.clj @@ -14,7 +14,8 @@ Elías F. Combarro, Julen Hurtado de Saracho, Irene Díaz https://www.sciencedirect.com/science/article/pii/S0020025519305043 " (:use conexp.base - conexp.math.algebra)) + conexp.math.algebra) + (:require [clojure.set :refer [difference union subset? intersection]])) ;; Sampler diff --git a/src/test/clojure/conexp/base_test.clj b/src/test/clojure/conexp/base_test.clj index 004ccc67d..3e8a7e725 100644 --- a/src/test/clojure/conexp/base_test.clj +++ b/src/test/clojure/conexp/base_test.clj @@ -8,7 +8,9 @@ (ns conexp.base-test (:use clojure.test - conexp.base)) + conexp.base) + (:require [clojure.set :refer [difference union subset? superset? intersection]] + [clojure.math.numeric-tower :refer [gcd]])) ;;; diff --git a/src/test/clojure/conexp/fca/contexts_test.clj b/src/test/clojure/conexp/fca/contexts_test.clj index 70b3d2d5e..3fa55e7f0 100644 --- a/src/test/clojure/conexp/fca/contexts_test.clj +++ b/src/test/clojure/conexp/fca/contexts_test.clj @@ -9,7 +9,9 @@ (ns conexp.fca.contexts-test (:use conexp.base conexp.fca.contexts) - (:use clojure.test)) + (:use clojure.test) + (:require [clojure.set :refer [difference union subset? intersection]] + [clojure.math.numeric-tower :refer [gcd]])) ;;; diff --git a/src/test/clojure/conexp/fca/implications_test.clj b/src/test/clojure/conexp/fca/implications_test.clj index 8065994a2..3460e972d 100644 --- a/src/test/clojure/conexp/fca/implications_test.clj +++ b/src/test/clojure/conexp/fca/implications_test.clj @@ -13,7 +13,8 @@ conexp.io.contexts conexp.math.algebra conexp.fca.implications) - (:require [conexp.fca.contexts-test :as contexts])) + (:require [conexp.fca.contexts-test :as contexts] + [clojure.set :refer [difference union subset? intersection]])) ;;; diff --git a/src/test/clojure/conexp/fca/lattices_test.clj b/src/test/clojure/conexp/fca/lattices_test.clj index a317d2370..b77169514 100644 --- a/src/test/clojure/conexp/fca/lattices_test.clj +++ b/src/test/clojure/conexp/fca/lattices_test.clj @@ -13,7 +13,9 @@ conexp.fca.posets conexp.math.algebra conexp.fca.lattices) - (:use clojure.test)) + (:use clojure.test) + (:require [clojure.set :refer [difference union subset? intersection]])) + ;;; Testing basic datastructure diff --git a/src/test/clojure/conexp/fca/more_test.clj b/src/test/clojure/conexp/fca/more_test.clj index ba55b03ca..20d8380ac 100644 --- a/src/test/clojure/conexp/fca/more_test.clj +++ b/src/test/clojure/conexp/fca/more_test.clj @@ -8,6 +8,7 @@ (ns conexp.fca.more-test (:require [clojure.test :refer [deftest is]] + [clojure.set :refer [difference union subset? intersection]] [conexp.base :refer :all] [conexp.fca.contexts :refer :all] [conexp.fca.contexts-test :refer :all] diff --git a/src/test/clojure/conexp/fca/protoconcepts_test.clj b/src/test/clojure/conexp/fca/protoconcepts_test.clj index 4b5c172ef..5b7ced32c 100644 --- a/src/test/clojure/conexp/fca/protoconcepts_test.clj +++ b/src/test/clojure/conexp/fca/protoconcepts_test.clj @@ -10,6 +10,7 @@ (:use conexp.base conexp.fca.contexts conexp.fca.protoconcepts) + (:require [clojure.set :refer [difference union subset? intersection]]) (:use clojure.test)) (def test-context-01 (make-context #{"a" "b" "c"} diff --git a/src/test/clojure/conexp/fca/smeasure_test.clj b/src/test/clojure/conexp/fca/smeasure_test.clj index c68fe508a..a7f2a6489 100644 --- a/src/test/clojure/conexp/fca/smeasure_test.clj +++ b/src/test/clojure/conexp/fca/smeasure_test.clj @@ -11,6 +11,7 @@ conexp.fca.implications conexp.fca.smeasure conexp.base) + (:require [clojure.set :refer [difference union subset? intersection]]) (:use clojure.test)) (def- ctx1 diff --git a/src/test/clojure/conexp/io/smeasure_test.clj b/src/test/clojure/conexp/io/smeasure_test.clj index 94bff1078..e0b506a69 100644 --- a/src/test/clojure/conexp/io/smeasure_test.clj +++ b/src/test/clojure/conexp/io/smeasure_test.clj @@ -14,6 +14,7 @@ conexp.layouts.base conexp.io.latex conexp.io.smeasure) + (:require [clojure.set :refer [difference union subset? intersection]]) (:use clojure.test)) ;;; diff --git a/src/test/clojure/conexp/layouts/base_test.clj b/src/test/clojure/conexp/layouts/base_test.clj index 89c143331..30bb3fdc2 100644 --- a/src/test/clojure/conexp/layouts/base_test.clj +++ b/src/test/clojure/conexp/layouts/base_test.clj @@ -14,6 +14,7 @@ conexp.fca.lattices conexp.layouts.base conexp.layouts.layered) + (:require [clojure.set :refer [difference union subset? intersection]]) (:use clojure.test)) ;;; diff --git a/src/test/clojure/conexp/layouts/common_test.clj b/src/test/clojure/conexp/layouts/common_test.clj index e0309b00d..14bd2e35c 100644 --- a/src/test/clojure/conexp/layouts/common_test.clj +++ b/src/test/clojure/conexp/layouts/common_test.clj @@ -13,7 +13,8 @@ conexp.fca.posets conexp.layouts.base conexp.layouts.common) - (:use clojure.test)) + (:use clojure.test) + (:require [clojure.set :refer [difference union subset? intersection]])) ;;; diff --git a/src/test/clojure/conexp/layouts/dim_draw_test.clj b/src/test/clojure/conexp/layouts/dim_draw_test.clj index fab1aa38c..1c0ee7b14 100644 --- a/src/test/clojure/conexp/layouts/dim_draw_test.clj +++ b/src/test/clojure/conexp/layouts/dim_draw_test.clj @@ -5,7 +5,8 @@ [conexp.base :exclude [transitive-closure] :refer :all] [loom.graph :as lg] [loom.alg :as la] - [rolling-stones.core :as sat :refer :all]) + [rolling-stones.core :as sat :refer :all] + [clojure.set :refer [difference union subset? intersection]]) (:use conexp.layouts.dim-draw)) ;;;