lib/transformers/multipasser.rb in optimus-ep-0.6.0 vs lib/transformers/multipasser.rb in optimus-ep-0.6.5

@@ -41,66 +41,69 @@
       include Enumerable
     
       def initialize(data = nil)
         @data = data
         @passes = []
-        @computed = false
+        reset!
       end
     
       def columns
-        compute! unless @computed
-        @all_data.columns.dup
+        computed.columns
       end
     
       def data=(data)
         @data = data
-        @computed = false
+        reset!
       end
     
-      def each
-        compute! unless @computed
-        @all_data.each do |row|
-          yield row
-        end
-      end
-    
       def add_pass(*args)
-        @computed = false
+        @computed = nil
         if args[0].instance_of? Pass
           p = args[0]
         else
           p = Pass.new(*args)
         end
         @passes << p and return p
       end
     
+      def each(&block)
+        computed.each(&block)
+      end
+    
       def [](index)
-        compute! unless @computed
-        return @all_data[index]
+        computed[index]
       end
     
       private
-      def compute!
-        @all_data = Eprime::Data.new
+      def computed
+        return @computed if @computed
+        if @passes.empty?
+          @computed = @data
+          return @computed
+        end
+        @computed = Eprime::Data.new
         # Just add a simple pass if we don't have any...
-        add_pass if @passes.empty?
         @passes.each do |pass|
           # We want to duplicate the data, add a sort expression to it, add
           # computed columns, filter it, and then merge it into the complete
           # dataset.
-          cur_data = @data.to_eprime_data 
+          #cur_data = @data.to_eprime_data 
           comp_data = ColumnCalculator.new
-          comp_data.data = cur_data
+          comp_data.data = @data
           comp_data.sort_expression = pass.sort_expression
           pass.computed_columns.each do |col|
             name, expr = *col
             comp_data.computed_column(name, expr)
           end
           filtered = RowFilter.new(comp_data, pass.row_filter)
-          @all_data.merge!(filtered)
+          @computed.merge!(filtered)
         end
-        @all_data = Eprime::Data.new.merge(@all_data.sort)
-        @computed = true
+        @computed.sort!
+        return @computed
+      end
+      
+      def reset!
+        @computed = nil
       end
     end
   end
 end
\ No newline at end of file