Skip to content

Commit

Permalink
Add a function for cross frame lookups (match)
Browse files Browse the repository at this point in the history 
A XLOOKUP equivalent
  • Loading branch information
@prabhanshuguptagit
prabhanshuguptagit committed Jun 28, 2024
1 parent b00bfa9 commit bc5b870
Show file tree
Hide file tree
Showing 3 changed files with 116 additions and 73 deletions.
5 changes: 0 additions & 5 deletions src/bean/area.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,8 @@
(= start end))

(defn overlap? [area-a area-b]
(prn area-a area-b)
(let [{[a-r1 a-c1] :start [a-r2 a-c2] :end} area-a
{[b-r1 b-c1] :start [b-r2 b-c2] :end} area-b]
(prn a-r2 b-r1
a-r1 b-r2
a-c2 b-c1
a-c1 b-c2)
(not
(or (< a-r2 b-r1)
(> a-r1 b-r2)
Expand Down
182 changes: 114 additions & 68 deletions src/bean/functions.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
[bean.interpreter :as interpreter]
[bean.frames :as frames]
[bean.util :as util]
[clojure.set :as set]
[clojure.string]))

(defn cell-ref? [[_ ast]]
Expand All @@ -23,92 +22,141 @@
(reduce str "" arg))
args))

(defn- new-frame-result [sheet frame-result new-selection & [skips]]
(let [new-selection (set new-selection)]
{:matrix (util/map-on-matrix
#(if (get new-selection %)
(util/get-cell (:grid sheet) %)
{:scalar "" :representation ""})
(area/addresses->address-matrix new-selection))
:frame (merge frame-result
{:selection new-selection
:skips skips})}))
(defn- address-matrix->cells-matrix [sheet matrix]
(util/map-on-matrix
#(if %
(util/get-cell (:grid sheet) %)
{:scalar "" :representation ""})
matrix))

(defn- remove-nil-columns [matrix]
(let [columns (apply map vector matrix)
non-nil-columns (remove #(every? nil? %) columns)]
(if (empty? non-nil-columns)
[]
(apply map vector non-nil-columns))))

(defn- remove-nil-rows [matrix]
(remove #(every? nil? %) matrix))

(defn minimum-matrix [matrix]
(if (not (first (first matrix)))
[[nil]]
matrix))

(defn bean-row [sheet args]
(let [frame-result (:frame (first args))
selection (:selection frame-result)
frame (frames/get-frame sheet (:name frame-result))
[start-r start-c] (:start frame)
[end-r end-c] (:end frame)
cols (range start-c (inc end-c))
labels (set (keys (:labels frame)))]
(as-> (for [col cols]
(for [[r _] selection]
[r col])) rcs
(mapcat identity rcs)
(set rcs)
(apply disj rcs labels)
(new-frame-result sheet frame-result rcs))))
(if-not (:error (first args))
(let [frame-result (:frame (first args))
selection (:selection frame-result)
frame (frames/get-frame sheet (:name frame-result))
[start-r start-c] (:start frame)
[end-r end-c] (:end frame)
cols (range start-c (inc end-c))
rows (map first (mapcat identity selection))
new-selection (->> (for [r rows]
(for [col cols]
[r col]))
minimum-matrix)]
{:matrix (address-matrix->cells-matrix sheet new-selection)
:frame (merge frame-result {:selection new-selection})})
(first args)))

(defn bean-col [sheet args]
(let [frame-result (:frame (first args))
selection (:selection frame-result)
frame (frames/get-frame sheet (:name frame-result))
[start-r start-c] (:start frame)
[end-r end-c] (:end frame)
rows (range start-r (inc end-r))
labels (set (keys (:labels frame)))]
(as-> (for [row rows]
(for [[_ c] selection]
[row c])) rcs
(mapcat identity rcs)
(set rcs)
(apply disj rcs labels)
(new-frame-result sheet frame-result rcs))))
(if-not (:error (first args))
(let [frame-result (:frame (first args))
selection (:selection frame-result)
frame (frames/get-frame sheet (:name frame-result))
[start-r start-c] (:start frame)
[end-r end-c] (:end frame)
cols (set (map second (mapcat identity selection)))
rows (range start-r (inc end-r))
new-selection (->> (for [r rows]
(for [col cols]
[r col]))
minimum-matrix)]
{:matrix (address-matrix->cells-matrix sheet new-selection)
:frame (merge frame-result {:selection new-selection})})
(first args)))

(defn bean-reduce [sheet args]
(let [frame-result (:frame (first args))
f (second args)
f* #(interpreter/apply-f-args sheet f [%1 %2])
val* (first (drop 2 args))
col* (->> (:selection frame-result)
(mapcat identity)
sort
(map #(util/get-cell (:grid sheet) %))
(remove #(clojure.string/blank? (:scalar %))))]
(if val*
(reduce f* val* col*)
(reduce f* col*))))

;; This doesn't work for matrices right now
;; These don't work for matrices right now
;; It should: eval-matrix should perhaps return a :selection also
(defn bean-filter [sheet args]
(let [frame-result (:frame (first args))
f (second args)
selection (:selection frame-result)]
(->> selection
(filter
#(:scalar
(interpreter/apply-f-args sheet f
[(util/get-cell (:grid sheet) %)])))
(new-frame-result sheet frame-result))))
(if-not (:error (first args))
(let [frame-result (:frame (first args))
f (second args)
new-selection (->> (:selection frame-result)
(util/map-on-matrix
#(when (:scalar
(interpreter/apply-f-args
sheet f [(util/get-cell (:grid sheet) %)]))
%))
remove-nil-columns
remove-nil-rows
minimum-matrix)]
{:matrix (address-matrix->cells-matrix sheet new-selection)
:frame (merge frame-result {:selection new-selection})})
(first args)))

(defn bean-match [sheet args]
(if-not (:error (first args))
(let [from-frame (:frame (first args))
to-frame (:frame (second args))]
(when (and from-frame to-frame)
(let [first-match
(reduce
#(if (get %1 %2)
%1
(assoc %1 (:representation (util/get-cell (:grid sheet) %2)) %2))
{}
(mapcat identity (:selection to-frame)))

new-selection
(->> (util/map-on-matrix
#(get first-match (:representation (util/get-cell (:grid sheet) %)))
(:selection from-frame))
remove-nil-columns
remove-nil-rows
minimum-matrix)]
{:matrix (address-matrix->cells-matrix sheet new-selection)
:frame {:selection new-selection
:name (:name to-frame)}})))
(first args)))

(defn- bean-get* [sheet args asts & [dirn]]
(let [frame-result (:frame (first args))
label (:scalar (second args))
existing-selection (:selection frame-result)
get-cells (frames/label-name->cells
sheet
(:name frame-result) label dirn)
new-selection (set/union
(set/intersection (:cells get-cells) existing-selection)
(set/intersection (:skips frame-result) (:skips get-cells)))]
(if (frames/label? sheet (:name frame-result) label dirn)
(new-frame-result sheet frame-result new-selection
(set/union
(:skips frame-result)
(:skips get-cells)))
(errors/label-not-found
(:scalar (interpreter/eval-ast (second asts) sheet))))))
(if-not (:error (first args))
(let [frame-result (:frame (first args))
label (:scalar (second args))]
(if (frames/label? sheet (:name frame-result) label dirn)
(let [label-cells (frames/label-name->cells
sheet
(:name frame-result) label dirn)
new-selection (->> (:selection frame-result)
(util/map-on-matrix
#(when (or (contains? (:cells label-cells) %)
(and (contains? (:skips frame-result) %)
(contains? (:skips label-cells) %))) %))
remove-nil-columns
remove-nil-rows
minimum-matrix)]
{:matrix (address-matrix->cells-matrix sheet new-selection)
:frame (merge frame-result {:selection new-selection})})
(errors/label-not-found
(:scalar (interpreter/eval-ast (second asts) sheet)))))
(first args)))

(defn bean-get [sheet args asts]
(bean-get* sheet args asts))
Expand All @@ -124,9 +172,7 @@
(:end frame)
(:grid sheet))
:frame {:name frame-name
:selection (area/area->addresses
(select-keys frame [:start :end]))
:selection-dirn nil}})
:selection (area/area->address-matrix frame)}})

(defn bean-frame [sheet args asts]
(cond
Expand Down
2 changes: 2 additions & 0 deletions src/bean/grid.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
:representation "f"}
"col" {:scalar functions/bean-col
:representation "f"}
"match" {:scalar functions/bean-match
:representation "f"}
"error" {:scalar functions/bean-error
:representation "f"}})

Expand Down

0 comments on commit bc5b870

Please sign in to comment.