namo 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d2d5b27fc7c414edd9d13ac80d87bc6f99c87b2f94a42b8f192c3e5a4f08daa
-  data.tar.gz: 91ff974cb3c20802cf0afea77563211a1d29abda66bf9960ed18611fbaf09410
+  metadata.gz: dcb7aafe4522ff115c12464016fef1a6909047975829523b095105f601a7ae60
+  data.tar.gz: 81f150f5f370f836734908a30e1ecd600b856f90c0151a698fa25bd117530d92
 SHA512:
-  metadata.gz: f309aa497bde5bd05083f844f8d123257917da3e74abe07e4e18a8aff3dd362ab0e2c2b4b6df0791cb3a1b55ea53f9f7914a89eda74c2d158c0d7e5cf1e6b358
-  data.tar.gz: 62040149299672f673de4216cc7123e78e0135902d5a5ad3c948e74e7d2906b184b9ac6a6e84238f000d85a63b3ccc0b6dc894c3cdb74a65fb6ec1d7df0d6e33
+  metadata.gz: 6fd5a96f0fdf85e6ffb8a3cfa2d1a560d5da1d118072e95cd549af43149ff2a4c963de122b9026c29c0817e33fcfbd2ba3ece969ee1f6f5d92738c3d7f38b73a
+  data.tar.gz: 78ba07312d7e4f4d4ac85a6ca572852964ed7055d48687361d8a86f9cb998122f421e75418ba67bc978bf78d7b0cc22315ebb800ca734e8ade07817bae886736

data/CHANGELOG

@@ -1,6 +1,51 @@
 CHANGELOG
 _________
 
+20260612
+0.16.0: ~ data/formula exclusivity — projection drops the formulae it materialises; * and ** raise on a data/formula name collision.
+
+1. ~ lib/namo.rb: Namo#[]'s positive-projection branch carries @formulae minus the projected
+   derived names — naming a derived dimension materialises it (stored values, computed against
+   the yielding Namo, windowed over any same-call selection) and drops the formula; omitted
+   formulae carry live and recompute from the result's own rows. Contraction and selection-only
+   calls are unchanged. The projection list is the materialise/live selector.
+2. ~ lib/namo.rb: Namo#* and Namo#** raise ArgumentError via the new private
+   raise_unless_data_formula_exclusivity when one operand's data dimension is the other's
+   derived dimension, block and no-block forms alike. Formula-vs-formula stays left-wins; the
+   set operators need no guard (matching-data-dimensions blocks the asymmetric case); the
+   constructor stays unguarded.
+3. ~ test/namo_test.rb: + "data/formula exclusivity" describe — access-path agreement on a
+   materialised dimension, dimension-listing, dependent-formula carry, omitted-formula
+   liveness, live-without-inputs caveat, two-arity windowing at materialisation,
+   contraction/selection unchanged, subclass type, composition collision raises (both
+   directions, both operators, block forms), left-wins formula merge, contraction-first
+   resolution.
+4. ~ test/namo_test.rb: + "range selection" context under #[] — basic range, beginless and
+   endless forms, range composed with projection, range on a formula-defined dimension
+   (Row_test holds the predicate matrix; these pin the Namo-level wiring).
+5. ~ README.md: + Projection of derived dimensions subsection under Formulae (naming
+   materialises, omitting carries live); data/formula collision sentences under Composition
+   and Cartesian product.
+6. ~ ROADMAP.md: Promote 0.16.0 to shipped; Current state -> 0.16.0; Summary folds in
+   exclusivity; next phase -> 0.17.0. window.length -> window.count and n.length -> n.count
+   in the remaining future-release examples (0.17.0, 2.x, 4.x) — Namo has no #length,
+   extending the 0.15.0 correction.
+7. ~ COMPARISON.md: Repoint the pre-renumbering planned markers to what shipped — proc-based,
+   regex-based, and mixed selection -> shipped (0.8.0); Enumerable methods return Namos ->
+   shipped (0.11.0), with the entry summary's parity sentence and the Sorting entry's
+   "as of 0.14.0" corrected to 0.11.0; values and to_h -> shipped (0.7.0). Aspect classes ->
+   not planned, the entry rewritten to record 0.7.0's plain-return-types decision (Namo#===
+   and subclassing cover case dispatch; a Matcher factory can serve a finer split later).
+   Aggregation repointed from 2.x to group_by returning a Namo::Collection at 0.19.0 (gated
+   on Collection at 0.18.0), with summary/members examples; bare names stay 2.x. Parameterised
+   formulae stays planned (0.17.0), its example's window.length -> window.count.
+8. ~ EXAMPLES.md: + Epidemiology / public health section — a cross-row (two-arity) rolling
+   weekly average in the four-stage format (Polars, then Namo 1.x/2.x/3.x), with the
+   (row, namo) window over the yielding Namo and a one-arity formula referencing the
+   two-arity one. window.length -> window.count in the finance 1.x and 2.x stages. Date
+   bumped to 20260612.
+9. ~ Namo::VERSION: /0.15.0/0.16.0/
+
 20260612
 0.15.0: + two-arity formulae — procs with arity 2 receive (row, namo) for cross-row computation.
 

data/README.md

@@ -353,7 +353,7 @@ ohlcv * fundamentals
 
 Inner-join semantics: unmatched rows from either side are dropped. Output dimensions are `self.data_dimensions` followed by `other.data_dimensions` exclusive to other. Duplicates on shared coordinates are preserved multiplicatively — output multiplicity is the product of input multiplicities on each matching key.
 
-The two Namos must have at least one shared data dimension. No overlap raises an `ArgumentError` — the asymmetry with `**` is deliberate, and falling through to a Cartesian product would silently turn a logic error into a large pile of nonsense rows. Formulae merge from both sides; the left-hand side wins on conflict.
+The two Namos must have at least one shared data dimension. No overlap raises an `ArgumentError` — the asymmetry with `**` is deliberate, and falling through to a Cartesian product would silently turn a logic error into a large pile of nonsense rows. Formulae merge from both sides; the left-hand side wins on conflict. A name that is data on one side and a formula on the other also raises an `ArgumentError` — the operands disagree about what the name means, with no last-write order to appeal to — so resolve before composing: `audited[-:margin] * modelled`.
 
 #### Conditional join
 
@@ -404,7 +404,7 @@ products ** quarters
 
 Output has `self.data.length * other.data.length` rows. Output dimensions are `self.data_dimensions + other.data_dimensions`, in operand order. Duplicates are preserved multiplicatively.
 
-The two Namos must have **no** shared data dimensions — the precondition is the mirror image of `*`. Any overlap raises an `ArgumentError`; allowing it would produce rows with the same dimension named twice. Formulae merge from both sides; the left-hand side wins on conflict.
+The two Namos must have **no** shared data dimensions — the precondition is the mirror image of `*`. Any overlap raises an `ArgumentError`; allowing it would produce rows with the same dimension named twice. Formulae merge from both sides; the left-hand side wins on conflict, and a data/formula name collision between the operands raises, as for `*`.
 
 The visual relationship is intentional: `*` is the filtered version, `**` is the explosive version — more sigil, more output.
 
@@ -644,6 +644,20 @@ sales[product: 'Widget'][:revenue, :quarter]
 
 Formulae carry through selection — a filtered Namo instance remembers its formulae.
 
+#### Projection of derived dimensions
+
+Naming a derived dimension in a projection asks for its values: they are computed against the source and stored in the result's rows, and the formula is dropped — the name is a data dimension of the result. Omitting it carries the formula live, recomputing from the result's own rows on every access:
+
+```ruby
+sales[:price, :quantity, :revenue].derived_dimensions
+# => [] — :revenue is stored values, a snapshot taken at projection
+
+sales[:price, :quantity].derived_dimensions
+# => [:revenue] — :revenue recomputes from the projected rows on every access
+```
+
+The projection list is the selector: name a derived dimension for a snapshot, omit it to keep it as computation. A carried formula whose inputs the projection dropped breaks on access — the same caveat as contracting away a formula's inputs.
+
 #### Cross-row formulae
 
 A formula's arity selects its calling convention. A proc with **one** parameter receives the row, as above. A proc with **two** parameters receives `(row, namo)`, where `namo` is the Namo the row belongs to — so the formula can reach beyond the current row to the rest of the collection. That's what cross-row computation needs: moving windows, ranks, running totals, anything whose value depends on the row's neighbours.

data/lib/Namo/VERSION.rb

@@ -2,5 +2,5 @@
 # Namo::VERSION
 
 class Namo
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

data/lib/namo.rb

@@ -71,7 +71,8 @@ class Namo
         rows.map(&:to_h)
       end
     )
-    self.class.new(projected, formulae: @formulae.dup)
+    carried = positive.any? ? @formulae.reject{|name, _| positive.include?(name)} : @formulae.dup
+    self.class.new(projected, formulae: carried)
   end
 
   def []=(name, value)
@@ -118,6 +119,7 @@ class Namo
   def *(other, &block)
     raise_unless_namo(other)
     raise_unless_shared_data_dimensions(other)
+    raise_unless_data_formula_exclusivity(other)
     shared = data_dimensions & other.data_dimensions
     combined_data = []
     @data.each do |left_row|
@@ -136,6 +138,7 @@ class Namo
   def **(other, &block)
     raise_unless_namo(other)
     raise_unless_disjoint_data_dimensions(other)
+    raise_unless_data_formula_exclusivity(other)
     combined_data = []
     @data.each do |left_row|
       if block
@@ -266,4 +269,11 @@ class Namo
       raise ArgumentError, "dimensions in common, need no common dimensions: #{data_dimensions} vs #{other.data_dimensions}"
     end
   end
+
+  def raise_unless_data_formula_exclusivity(other)
+    collisions = (data_dimensions & other.derived_dimensions) | (derived_dimensions & other.data_dimensions)
+    if collisions.any?
+      raise ArgumentError, "name collision between data and formulae: #{collisions.inspect}"
+    end
+  end
 end

data/test/namo_test.rb

@@ -491,6 +491,36 @@ describe Namo do
       end
     end
 
+    context "range selection" do
+      it "selects rows whose value falls within the range" do
+        result = sales[price: 5.0..15.0]
+        _(result.to_a.count).must_equal 2
+        _(result.to_a.map{|row| row[:product]}).must_equal ['Widget', 'Widget']
+      end
+
+      it "supports beginless and endless ranges" do
+        _(sales[price: ..15.0].to_a.count).must_equal 2
+        _(sales[quantity: 100..].to_a.count).must_equal 2
+      end
+
+      it "composes with projection in a single call" do
+        result = sales[:product, :quantity, quantity: 50..120]
+        _(result.to_a).must_equal [
+          {product: 'Widget', quantity: 100},
+          {product: 'Gadget', quantity: 60}
+        ]
+      end
+
+      it "selects on a formula-defined dimension" do
+        sales[:revenue] = proc{|r| r[:price] * r[:quantity]}
+        result = sales[revenue: 1200.0..]
+        _(result.to_a).must_equal [
+          {product: 'Widget', quarter: 'Q2', price: 10.0, quantity: 150},
+          {product: 'Gadget', quarter: 'Q2', price: 25.0, quantity: 60}
+        ]
+      end
+    end
+
     context "mixed proc and regex selection" do
       it "combines a proc and a regex across dimensions" do
         result = sales[product: /^W/, quantity: ->(v){v > 100}]
@@ -767,6 +797,176 @@ describe Namo do
     end
   end
 
+  describe "data/formula exclusivity" do
+    context "projection" do
+      let(:price_data) do
+        [
+          {symbol: 'AAA', date: 1, close: 10.0},
+          {symbol: 'AAA', date: 2, close: 20.0},
+          {symbol: 'AAA', date: 3, close: 30.0},
+        ]
+      end
+
+      let(:prices) do
+        Namo.new(price_data)
+      end
+
+      let(:sma) do
+        ->(row, namo){
+          window = namo[symbol: row[:symbol], date: ->(d){d <= row[:date]}]
+          window.values(:close).sum / window.count.to_f
+        }
+      end
+
+      it "agrees across all access paths on a materialised dimension" do
+        prices[:sma] = sma
+        projected = prices[:date, :sma]
+        _(projected.values(:sma)).must_equal [10.0, 15.0, 20.0]
+        _(projected.first[:sma]).must_equal projected.values(:sma).first
+        _(projected[sma: ->(v){v > 12.0}].values(:date)).must_equal [2, 3]
+      end
+
+      it "lists a materialised dimension as data, not derived, exactly once" do
+        prices[:sma] = sma
+        projected = prices[:date, :sma]
+        _(projected.data_dimensions).must_include :sma
+        _(projected.derived_dimensions).wont_include :sma
+        _(projected.dimensions.count(:sma)).must_equal 1
+      end
+
+      it "carries a dependent formula not named in the projection, resolving off the materialised column" do
+        prices[:sma] = sma
+        prices[:double_sma] = ->(row){row[:sma] * 2}
+        projected = prices[:date, :sma]
+        _(projected.derived_dimensions).must_equal [:double_sma]
+        _(projected.values(:double_sma)).must_equal [20.0, 30.0, 40.0]
+      end
+
+      it "carries an omitted formula live, recomputing from the result's own rows" do
+        sales[:revenue] = proc{|r| r[:price] * r[:quantity]}
+        projected = sales[:price, :quantity]
+        _(projected.derived_dimensions).must_equal [:revenue]
+        _(projected.values(:revenue)).must_equal [1000.0, 1500.0, 1000.0, 1500.0]
+        projected.data.first[:quantity] = 200
+        _(projected.values(:revenue).first).must_equal 2000.0
+      end
+
+      it "breaks on access when a carried formula's inputs were dropped (caveat emptor)" do
+        sales[:revenue] = proc{|r| r[:price] * r[:quantity]}
+        projected = sales[:product]
+        _(projected.derived_dimensions).must_equal [:revenue]
+        _ { projected.values(:revenue) }.must_raise NoMethodError
+      end
+
+      it "materialises a two-arity formula windowed over the yielding Namo" do
+        prices[:sma] = sma
+        _(prices[:date, :sma].values(:sma)).must_equal [10.0, 15.0, 20.0]
+      end
+
+      it "windows a two-arity materialisation over a same-call selection" do
+        prices[:sma] = sma
+        projected = prices[:date, :sma, date: 2..3]
+        _(projected.values(:sma)).must_equal [20.0, 25.0]
+      end
+
+      it "carries all formulae through a selection-only call" do
+        sales[:revenue] = proc{|r| r[:price] * r[:quantity]}
+        result = sales[price: ..15.0]
+        _(result.derived_dimensions).must_equal [:revenue]
+        _(result.values(:revenue)).must_equal [1000.0, 1500.0]
+      end
+
+      it "carries all formulae through contraction" do
+        sales[:revenue] = proc{|r| r[:price] * r[:quantity]}
+        result = sales[-:quarter]
+        _(result.derived_dimensions).must_equal [:revenue]
+        _(result.values(:revenue)).must_equal [1000.0, 1500.0, 1000.0, 1500.0]
+      end
+
+      it "returns pure materialised values and empty formulae when only derived names are projected" do
+        prices[:sma] = sma
+        projected = prices[:sma]
+        _(projected.to_a).must_equal [{sma: 10.0}, {sma: 15.0}, {sma: 20.0}]
+        _(projected.formulae).must_equal({})
+      end
+
+      it "returns an instance of self's class" do
+        subclass = Class.new(Namo)
+        namo = subclass.new([{x: 1}])
+        namo[:double] = ->(row){row[:x] * 2}
+        _(namo[:double].class).must_equal subclass
+      end
+    end
+
+    context "composition" do
+      let(:audited) do
+        Namo.new([
+          {symbol: 'BHP', margin: 0.3},
+          {symbol: 'RIO', margin: 0.25}
+        ])
+      end
+
+      let(:modelled) do
+        namo = Namo.new([
+          {symbol: 'BHP', price: 10.0, cost: 6.0},
+          {symbol: 'RIO', price: 20.0, cost: 16.0}
+        ])
+        namo[:margin] = proc{|r| (r[:price] - r[:cost]) / r[:price]}
+        namo
+      end
+
+      let(:audited_orders) do
+        Namo.new([{order: 'A', margin: 0.3}])
+      end
+
+      let(:modelled_tiers) do
+        namo = Namo.new([{tier: 'light', price: 10.0, cost: 6.0}])
+        namo[:margin] = proc{|r| (r[:price] - r[:cost]) / r[:price]}
+        namo
+      end
+
+      it "raises on * when self's data dimension is other's derived dimension" do
+        _ { audited * modelled }.must_raise ArgumentError
+      end
+
+      it "raises on * when self's derived dimension is other's data dimension" do
+        _ { modelled * audited }.must_raise ArgumentError
+      end
+
+      it "raises on ** when self's data dimension is other's derived dimension" do
+        _ { audited_orders ** modelled_tiers }.must_raise ArgumentError
+      end
+
+      it "raises on ** when self's derived dimension is other's data dimension" do
+        _ { modelled_tiers ** audited_orders }.must_raise ArgumentError
+      end
+
+      it "raises in the block forms of both operators" do
+        _ { audited.*(modelled){|row, candidates| candidates} }.must_raise ArgumentError
+        _ { audited_orders.**(modelled_tiers){|row, candidates| candidates} }.must_raise ArgumentError
+      end
+
+      it "names the colliding dimensions in the message" do
+        err = _ { audited * modelled }.must_raise ArgumentError
+        _(err.message).must_match(/name collision between data and formulae/)
+        _(err.message).must_include ':margin'
+      end
+
+      it "does not raise on a formula-vs-formula collision — left wins" do
+        left = Namo.new([{symbol: 'BHP', close: 42.5}])
+        right = Namo.new([{symbol: 'BHP', pe: 14.5}])
+        left[:margin] = proc{|r| :left}
+        right[:margin] = proc{|r| :right}
+        _((left * right).values(:margin)).must_equal [:left]
+      end
+
+      it "composes after explicit resolution by contraction" do
+        result = audited[-:margin] * modelled
+        _(result.values(:margin)).must_equal [0.4, 0.2]
+      end
+    end
+  end
+
   describe "#each" do
     it "yields Row objects" do
       rows = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namo
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - thoran