ctioga2 0.13.1 → 0.14

data/lib/ctioga2/data/dataset.rb

@@ -225,7 +225,7 @@ module CTioga2
       # _x_, _xmin_, _xmax_, _y_, _ymin_, _ymax_, _y1_, _y1min_, _y1max_,
       #  _z_, _zmin_, _zmax_, _y2_, _y2min_, _y2max_, _y3_, _y3min_, _y3max_
       #
-      def select!(&block)
+      def select!(evaluator)
         target = []
         @x.size.times do |i|
           args = @x.values_at(i, true)
@@ -236,7 +236,7 @@ module CTioga2
               args.concat(yvect.values_at(i, true))
             end
           end
-          if block.call(*args)
+          if evaluator.compute_unsafe(*args)
             target << i
           end
         end
@@ -260,8 +260,8 @@ module CTioga2
             i += 1
           end
         end
-        block = eval("proc do |#{names.join(',')}|\n#{formula}\nend")
-        select!(&block)
+        evaluator = Ruby.make_evaluator(formula, names)
+        select!(evaluator)
       end
 
       # \todo a dup !
@@ -755,13 +755,14 @@ module CTioga2
 
       end
 
-      protected
 
       # Returns all DataColumn objects held by this Dataset
       def all_columns
         return [@x, *@ys]
       end
 
+      protected
+
       # Returns all Dvectors of the columns one by one.
       def all_vectors
         return all_columns.map {|x| x.vectors}.flatten(1)

data/lib/ctioga2/data/filters.rb

@@ -42,13 +42,16 @@ dataset pushed unto the data stack: they can be viewed as filters.",
 Sorts the last dataset pushed unto the stack according to X values. Can be
 used as a filter.
 
+This command sorts in-place.
+
 See also {command: sort}.
 EOH
 
       SortFilter = 
         Cmd.new("sort", nil, "--sort", 
                 [], {}) do |plotmaker, opts|
-        plotmaker.data_stack.add_to_dataset_hook('sort-last()')
+        plotmaker.data_stack.
+          add_to_dataset_hook(Commands::Instruction.new('sort-last', [], {}))
       end
       
       SortFilter.describe("Systematically sort subsequent datasets",
@@ -80,7 +83,8 @@ EOH
                 [CmdArg.new('integer')], {}) do |plotmaker, number, opts|
         ## @todo There should be a way to add commands in a type-safe
         ## way, without having to convert to string first.
-        plotmaker.data_stack.add_to_dataset_hook("trim-last(#{number})")
+        plotmaker.data_stack.
+          add_to_dataset_hook(Commands::Instruction.new('trim-last', [number], {}))
       end
       
       TrimFilter.describe("Systematically trim subsequent datasets",
@@ -113,7 +117,8 @@ EOH
       CherryPickFilter = 
         Cmd.new("cherry-pick", nil, "--cherry-pick", 
                 [CmdArg.new('text')], {}) do |plotmaker, formula|
-        plotmaker.data_stack.add_to_dataset_hook("cherry-pick-last '#{formula}'")
+        plotmaker.data_stack.
+          add_to_dataset_hook(Commands::Instruction.new('cherry-pick-last', [formula], {}))
       end
       
       CherryPickFilter.describe("Systematicallly remove data for which the formula is false",
@@ -162,7 +167,8 @@ EOH
       AverageDupFilter = 
         Cmd.new("avg-dup", nil, "--avg-dup", 
                 [], {}) do |plotmaker, formula|
-        plotmaker.data_stack.add_to_dataset_hook("avg-dup-last()")
+        plotmaker.data_stack.
+          add_to_dataset_hook(Commands::Instruction.new('avg-dup-last', [], {}))
       end
       
       AverageDupFilter.describe("Systematicallly average successive elements with identical X values",
@@ -189,7 +195,8 @@ EOH
       SmoothFilter = 
         Cmd.new("smooth", nil, "--smooth", 
                 [CmdArg.new('integer')], {}) do |plotmaker, nb|
-        plotmaker.data_stack.add_to_dataset_hook("smooth-last #{nb}")
+        plotmaker.data_stack.
+          add_to_dataset_hook(Commands::Instruction.new('smooth-last', [nb], {}))
       end
       
       SmoothFilter.describe("Systematicallly smooth data",

data/lib/ctioga2/data/stack.rb

@@ -52,13 +52,7 @@ module CTioga2
       # A hook executed every time a dataset is pushed unto the stack
       # using #add_dataset.
       #
-      # \todo this string is parsed for each call to
-      # #add_dataset. Perhaps it would be good to provide a way to
-      # record a Command call, without parsing it from scratch ???
-      # 
-      # Although, with variables, that could be interesting to reparse
-      # everytime, since any change in the variables would be taken
-      # into account.
+      # This is a list of Instruction
       attr_accessor :dataset_hook
 
       # Creates a new DataStack object.
@@ -70,6 +64,8 @@ module CTioga2
         # Defaults to the 'text' backend
         @backend_factory = Data::Backends::BackendFactory.new('text')
 
+        @dataset_hook = []
+
         # Probably a bit out of place...
         csv = 
           Cmd.new('csv', nil, '--csv', []) do |plotmaker|
@@ -88,7 +84,7 @@ EOH
       # Performs expansion on the given _set_ with the current
       # backend, retrieves corresponding Dataset objects, pushes them
       # onto the stack and returns them.
-      def get_datasets(set, options = {})
+      def get_datasets(set, options = {}, add = true)
         backend = @backend_factory.specified_backend(options)
         sets = backend.expand_sets(set)
         datasets = []
@@ -100,7 +96,9 @@ EOH
             debug { "#{e.backtrace.join("\n")}" }
           end
         end
-        add_datasets(datasets, options)
+        if add
+          add_datasets(datasets, options)
+        end
         return datasets
       end
 
@@ -152,7 +150,16 @@ EOH
             end
           end
         else
-          if @named_datasets.key? spec
+          if spec =~ /^\s*#(.*)/
+            # graph idea -> get dataset from the plot element
+            eln = $1
+            obj = Elements::TiogaElement.find_object(eln)
+            if !obj.respond_to(:dataset)
+              raise "Object '##{eln}' does not name a plot"
+            end
+            ds = obj.dataset
+            index = @stack.index(ds)
+          elsif @named_datasets.key? spec
             name = spec
             ds = @named_datasets[spec]
             i = 0
@@ -189,13 +196,14 @@ EOH
       def store_dataset(dataset, ignore_hooks = false)
         @stack << dataset
         if @dataset_hook && (! ignore_hooks)
-          # \todo error handling
-          begin
-            PlotMaker.plotmaker.interpreter.run_commands(@dataset_hook)
-          rescue Exception => e
-            error { "There was a problem running the dataset hook '#{@dataset_hook}', disabling it" }
-            @dataset_hook = nil
-            info { "-> '#{format_exception e}'" }
+          for ins in @dataset_hook
+            begin
+              ins.run(PlotMaker.plotmaker)
+            rescue Exception => e
+              error { "There was a problem running the dataset hook '#{ins.to_s}', disabling it" }
+              @dataset_hook.delete(ins)
+              info { "-> '#{format_exception e}'" }
+            end
           end
         end
       end
@@ -222,9 +230,9 @@ EOH
       # Appends a set of commands to the dataset hook
       def add_to_dataset_hook(commands)
         if @dataset_hook
-          @dataset_hook << "\n#{commands}"
+          @dataset_hook += [commands].flatten
         else
-          @dataset_hook = commands
+          @dataset_hook = [commands].flatten
         end
       end
 
@@ -314,13 +322,34 @@ EOH
                    "Commands for manipulation of the data stack", 
                    100)
 
-    LoadDatasetOptions = { 
-      'name' => CmdArg.new('text'),
+    AppendDatasetOptions = { 
       'as' => CmdArg.new('text'),
       'where' => CmdArg.new('text'),
       'ignore_hooks' => CmdArg.new('boolean')
     }
     
+    AppendDataCommand = 
+      Cmd.new("append", nil, "--append", 
+              [ CmdArg.new('dataset'), ], 
+              AppendDatasetOptions) do |plotmaker, set, opts|
+      datasets = plotmaker.data_stack.get_datasets(set, opts, false)
+      # Now, we append them to the last dataset
+      plotmaker.data_stack.concatenate_datasets(datasets)
+    end
+    
+    AppendDataCommand.describe("Appends the datasets to the last in the stack",
+                             <<EOH, DataStackGroup)
+Use the current backend to load the given dataset(s) and append to the
+last dataset on the stack (without creating a new dataset). Roughly
+the equivalent of first running {command: load} and then 
+{command: join-datasets}.
+EOH
+    
+    LoadDatasetOptions = AppendDatasetOptions.dup.merge(
+      {
+        'name' => CmdArg.new('text')
+      })
+    
     LoadDataCommand = 
       Cmd.new("load", '-L', "--load", 
               [ CmdArg.new('dataset'), ], 
@@ -338,9 +367,10 @@ similar construct), each dataset gets named with %d replace with the
 number of the dataset within the expansion (starting at 0). This name
 can be used to further use the dataset without remembering its
 number. See the type {type: stored-dataset} for more information.
-
 EOH
 
+
+    
     ContourOptions = LoadDatasetOptions.dup.update({
       'which' => CmdArg.new('stored-dataset'),
     })
@@ -439,6 +469,57 @@ EOH
     ApplyLastCommand.describe("Applies a formula to the last dataset",
                               <<EOH, DataStackGroup)
 Applies a formula to the last dataset (or the named one)
+EOH
+
+    BinLastCommand = 
+      Cmd.new("bin", nil, "--bin", 
+              [], 
+              { 
+                'number' => CmdArg.new('integer'),
+                'column' => CmdArg.new('integer'),
+                'delta' => CmdArg.new('float'),
+                'min' => CmdArg.new('float'),
+                'max' => CmdArg.new('float'),
+                'normalize' => CmdArg.new('boolean'),
+                'which' => CmdArg.new('stored-dataset'),
+                'name' => CmdArg.new('text') 
+              }) do |plotmaker, opts|
+      stack = plotmaker.data_stack
+      ds = plotmaker.data_stack.specified_dataset(opts)
+
+      cn = opts['column'] || 1
+      col = ds.all_columns[cn]
+
+      
+      if opts.key? 'number'
+        min = opts['min'] || col.min
+        max = opts['max'] || col.max
+        number = opts['number']
+      elsif opts.key? 'delta'
+        delta = opts['delta']
+        if opts.key? 'min'
+          min = opts['min']
+          max = min+((col.max-min)/delta).ceil*delta
+        elsif opts.key? 'max'
+          max = opts['max']
+          min = max-((max-col.min)/delta).floor*delta
+        else
+          min = (col.min/delta).floor * delta
+          max = (col.max/delta).ceil * delta
+        end
+        number = ((max-min)/delta).to_i
+      else
+        raise "Must specify either the option 'number' or the option 'delta'"
+      end
+
+      newds = Dataset.new("bin", col.bin(min, max, number, opts['normalize']))
+      plotmaker.data_stack.add_datasets([newds], opts)
+    end
+    
+    BinLastCommand.describe("Bins the last dataset",
+                            <<EOH, DataStackGroup)
+This command bins the contents of the Y column of the last dataset on the 
+stack, and pushes the results as a new dataset.
 EOH
 
     ShowStackCommand = 
@@ -537,6 +618,7 @@ EOH
     SetDatasetHookCommand = 
       Cmd.new("dataset-hook", nil, "--dataset-hook", 
               [CmdArg.new('commands')], {}) do |plotmaker, commands, opts|
+      raise 'This command is disabled as of now'
       plotmaker.data_stack.dataset_hook = commands
     end
     
@@ -562,6 +644,7 @@ EOH
     AddDatasetHookCommand = 
       Cmd.new("dataset-hook-add", nil, "--dataset-hook-add", 
               [CmdArg.new('commands')], {}) do |plotmaker, commands, opts|
+      raise 'This command is disabled as of now'
       plotmaker.data_stack.add_to_dataset_hook(commands)
     end
     

data/lib/ctioga2/graphics/elements.rb

@@ -71,7 +71,7 @@ EOH
 Sets the range of the #{x.to_s.upcase} coordinates.
 
 *Important note:* when the axis is in log range (using
-{command: #{x.to_s.upcase}log}), the numbers you give are not the or
+{command: #{x.to_s}log}), the numbers you give are not the or
 {command: ylog} values, but their @log10@, so that to
 display #{x.to_s.upcase} values from @1e-2@ to @1e3@, use:
 

data/lib/ctioga2/graphics/elements/curve2d.rb

@@ -205,7 +205,7 @@ module CTioga2
         
         ## Actually draws the curve
         def real_do(t)
-          debug { "Plotting curve #{inspect}" }
+          debug { "Plotting curve #{to_yaml}" }
           t.context do
             ## \todo allow customization of the order of drawing,
             ## using a simple user-specificable array of path,

data/lib/ctioga2/graphics/elements/element.rb

@@ -167,6 +167,7 @@ module CTioga2
 
         def self.register_object(obj)
           @registered_objects ||= {}
+          @objects_by_class ||= {}
           if i = obj.object_id
             if @registered_objects.key? i
               warn { "Second object with ID #{i}, ignoring the name" }
@@ -174,6 +175,10 @@ module CTioga2
               @registered_objects[i] = obj
             end
           end
+          for cls in (obj.object_classes || [])
+            @objects_by_class[cls] ||= []
+            @objects_by_class[cls] << obj
+          end
         end
 
         def self.find_object(obj_id)
@@ -184,12 +189,27 @@ module CTioga2
             raise "No such object: '#{obj_id}'"
           end
         end
-              
+
+        def self.find_objects(id_list)
+          # First split on commas:
+          ids = id_list.split(/\s*,\s*/)
+          objs = []
+          @objects_by_class ||= {}
+          for oi in ids
+            if oi =~ /^\.(.*)/
+              objs += (@objects_by_class[$1] || [])
+            elsif oi =~ /^\#?(.*)/
+              objs << self.find_object($1)
+            end
+          end
+          return objs
+        end
+
         
         def setup_style(obj_parent, opts) 
           @cached_options = opts
           @object_id = opts["id"] || nil
-          @object_classes = opts["class"] || []
+          @object_classes = opts.key?("class") ? [opts["class"]].flatten : []
           @object_parent = obj_parent
 
           TiogaElement.register_object(self)
@@ -232,10 +252,10 @@ module CTioga2
         # redefine _do_ too if you need another debugging output.
         def do(f)
           if @hidden
-            debug { "not plotting hidden #{self.inspect}" }
+            debug { "not plotting hidden #{self.to_yaml}" }
             return 
           else
-            debug { "plotting #{self.inspect}" }
+            debug { "plotting #{self.to_yaml}" }
           end
           @gp_cache = {}
           real_do(f)
@@ -313,12 +333,11 @@ appropriate command).
 EOD
 
       ObjectsType = 
-        CmdType.new('objects', {:type => :array,
-                      :subtype => {:type => :function_based,
-                        :class => Elements::TiogaElement,
-                        :func_name => :find_object}
-                      }, <<EOD)
-A list of comma-separated {type: object}s.
+        CmdType.new('objects', {:type => :function_based,
+                      :class => Elements::TiogaElement,
+                      :func_name => :find_objects}, <<EOD)
+A list of comma-separated {type: object}s, or a class specification
+starting with a .
 EOD
 
     end

data/lib/ctioga2/graphics/elements/primitive.rb

@@ -161,6 +161,29 @@ module CTioga2
           return primitive_class
         end
 
+
+
+        primitive("legend-pictogram", "legend-pictogram",
+                  ["point", "object"], {
+                    'width' => 'dimension'
+                  },
+                  "Draws the legend pictogram for the given curve"
+                 ) do |t, point, obj, opts|
+          al = Types::AlignedPoint::from_point(point)
+          cs = obj.curve_style
+          
+          dx = opts['width'] || Types::Dimension.new(:dy, 2.5)
+          # dy = opts['height'] || Types::Dimension.new(:dy, 1)
+          dy = dx*0.4           # I'm not sure it really matters
+          pbb = Types::PointBasedBox.new(al, dx, dy)
+          pbb.within_frames(t) do
+            cs.draw_legend_pictogram(t)
+          end
+        end
+                  
+
+        
+
         # This creates a primitive base on a style object, given a
         # _style_class_, the base _style_name_ for the underlying
         # styling system, options to remove and options to add.
@@ -265,8 +288,9 @@ EOD
                          [ 'point', 'dimension' ],
                          Styles::OrientedLineStyle,
                          'oriented-line'
-                  ) do |t, org, dim, style, options|
-          style.draw_oriented_arrow(t, *org.to_figure_xy(t), dim)
+                        ) do |t, org, dim, style, options|
+          
+          style.draw_oriented_arrow(t, *(org.to_figure_xy(t) + [dim]))
         end