       ((c/juxt #'conf-above-50 #'per-day) ?conf :> ?conf-50 ?count)
       (fires-above-330 ?kelvin :> ?temp-330)
       (both-preds ?conf ?kelvin :> ?both-preds)
-      (tupleize ?temp-330 ?conf-50 ?both-preds ?count :> ?tuple)))
+      (fire-tuple ?temp-330 ?conf-50 ?both-preds ?count :> ?tuple)))
 
 ;; ## Fire Queries
 

(defn add-fires
  "Adds together two FireTuple objects."
  [t1 t2]
  (tupleize (+ (.temp330 t1) (.temp330 t2))
            (+ (.conf50 t1) (.conf50 t2))
            (+ (.bothPreds t1) (.bothPreds t2))
            (+ (.count t1) (.count t2))))


;; Combines various fire tuples into one.
(defaggregateop comb
  ([] (FireTuple. 0 0 0 0))
  ([state tuple] (add-fires state tuple))
  ([state] [state]))


  (fn [c t] (and (> t 330)
                (> c 50))))

(defn fire-tuple
  [t-above-330 c-above-50 both-preds count]
  (FireTuple. t-above-330 c-above-50 both-preds count))

