ctioga2 0.2 → 0.3

data/lib/ctioga2/data/backends/factory.rb

@@ -20,7 +20,7 @@ require 'ctioga2/data/backends/backend'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 2 $', '$Date: 2009-04-25 14:03:30 +0200 (Sat, 25 Apr 2009) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Data
 

data/lib/ctioga2/data/backends/parameter.rb

@@ -21,7 +21,7 @@ require 'ctioga2/metabuilder/type'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 17 $', '$Date: 2009-04-28 22:22:22 +0200 (Tue, 28 Apr 2009) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Data
 

data/lib/ctioga2/data/datacolumn.rb

@@ -17,7 +17,7 @@ require 'ctioga2/utils'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 229 $', '$Date: 2011-01-17 17:34:57 +0100 (Mon, 17 Jan 2011) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Data
 

data/lib/ctioga2/data/dataset.rb

@@ -12,12 +12,13 @@
 # GNU General Public License for more details (in the COPYING file).
 
 require 'ctioga2/utils'
+require 'ctioga2/log'
 require 'ctioga2/data/datacolumn'
 require 'ctioga2/data/indexed-dtable'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 233 $', '$Date: 2011-01-20 10:26:42 +0100 (Thu, 20 Jan 2011) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
 
   # \todo now, port the backend infrastructure...
@@ -43,6 +44,8 @@ module CTioga2
       # legend (like for the --auto-legend option of ctioga).
       attr_accessor :name
 
+      include Log
+
       # Creates a new Dataset object with the given data columns
       # (Dvector or DataColumn). #x is the first one
       def initialize(name, columns)
@@ -298,6 +301,43 @@ module CTioga2
         
       end
 
+      # Applies formulas to values. Formulas are like text-backend
+      # specification: ":"-separated specs of the target
+      def apply_formulas(formula)
+        columns = []
+        columns << Dobjects::Dvector.new(@x.size) do |i|
+          i
+        end
+        columns << @x.values
+        for y in @ys
+          columns << y.values
+        end
+
+        # Names:
+        heads = {
+          'x' => 1,
+          'y' => 2,
+          'z' => 3,
+        }
+        i = 1
+        for f in @ys
+          heads["y#{i}"] = i+1
+          i += 1
+        end
+
+        result = []
+        for f in formula.split(/:/) do
+          fm = Utils::parse_formula(f, nil, heads)
+          debug { 
+            "Using formula #{fm} for column spec: #{f} (##{result.size})" 
+          }
+          result << DataColumn.new(Dobjects::Dvector.
+                                   compute_formula(fm, 
+                                                   columns))
+        end
+        return Dataset.new(name + "_mod", result)
+      end
+
 
       # Returns an IndexedDTable representing the XYZ
       # data. Information about errors are not included.
@@ -349,14 +389,20 @@ module CTioga2
         return @indexed_dtable
       end
 
-      # Returns a x,y Function 
+      # Returns a x,y Function
+      #
+      # @todo add algorithm
       def make_contour(level)
         dtable = indexed_table
         x,y,gaps = *dtable.make_contour(level)
+
+        # We remove any gap corresponding to the element size,
+        # meaningless.
+        gaps -= [x.size]
         n = 0.0/0.0
         gaps.sort.reverse.each do |i|
-          x.insert(i-1,n)
-          y.insert(i-1,n)
+          x.insert(i,n)
+          y.insert(i,n)
         end
         return Dobjects::Function.new(x,y)
       end

data/lib/ctioga2/data/filters.rb

@@ -19,7 +19,7 @@ require 'ctioga2/data/backends/factory'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 194 $', '$Date: 2010-11-22 10:26:54 +0100 (Mon, 22 Nov 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
 
   module Data

data/lib/ctioga2/data/indexed-dtable.rb

@@ -15,7 +15,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 181 $', '$Date: 2010-10-27 15:18:35 +0200 (Wed, 27 Oct 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
 
   module Data

data/lib/ctioga2/data/point.rb

@@ -17,7 +17,7 @@ require 'ctioga2/data/dataset'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 112 $', '$Date: 2009-11-09 22:34:12 +0100 (Mon, 09 Nov 2009) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
 
   module Data

data/lib/ctioga2/data/stack.rb

@@ -25,7 +25,7 @@ require 'ctioga2/data/filters'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 233 $', '$Date: 2011-01-20 10:26:42 +0100 (Thu, 20 Jan 2011) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
 
   module Data
@@ -80,8 +80,14 @@ module CTioga2
       def get_datasets(set, options = {})
         backend = @backend_factory.current
         sets = backend.expand_sets(set)
-        datasets = sets.map do |s|
-          backend.dataset(s)
+        datasets = []
+        for s in sets
+          begin
+            datasets << backend.dataset(s)
+          rescue Exception => e
+            error { "Could not load dataset #{s} -- #{e}" }
+            debug { "#{e.backtrace.join("\n")}" }
+          end
         end
         add_datasets(datasets, options)
         return datasets
@@ -157,6 +163,25 @@ module CTioga2
         end
       end
 
+      # Returns a list of datasets, either a named dataset, or the
+      # last datasets from the stack
+      def latest_datasets(opts)
+        if opts['which']
+          if opts['number']
+            warn { "Cannot use both which and number" }
+          end
+          datasets = [ specified_dataset(opts) ]
+        else
+          nb = opts['number'] || 2
+          if stack.stack.size < nb
+            raise "Not enough datasets on the stack"
+          end
+          datasets = stack.stack[(- nb).. -2]
+          datasets.reverse!
+        end
+      end
+        
+        
       # Appends a set of commands to the dataset hook
       def add_to_dataset_hook(commands)
         if @dataset_hook
@@ -176,25 +201,25 @@ module CTioga2
         end
       end
 
-      # Pops the last _n_ datasets off the stack and pushes back the
-      def concatenate_datasets(n = 2)
+      # Add all the given datasets to the current one.
+      def concatenate_datasets(datasets, name = nil)
         ds = @stack.pop
         raise "Nothing on the stack" unless ds
-        (n-1).times do
-          ds2 = @stack.pop
-          raise "Not enough datasets on the stack" unless ds2
+
+        for ds2 in datasets
           ds << ds2
         end
         @stack.push(ds)
+        # Name the dataset
+        @named_datasets[name] = ds if name
       end
 
-      # Merges the last datasets into a new one.
+      # Merges one or more datasets into the last one.
       #
-      # Over
-      def merge_datasets(n = 2, columns = [0], precision = nil)
+      # The last dataset of the stack is overwritten.
+      def merge_datasets_into_last(datasets, columns = [0], precision = nil)
         ds = @stack.pop
         raise "Nothing on the stack" unless ds
-        datasets = @stack[-1..-(n-1)]
         ds.merge_datasets_in(datasets, columns, precision)
         @stack.push(ds)
       end
@@ -204,6 +229,32 @@ module CTioga2
         return @stack.last
       end
 
+      # Displays the contents of the stack
+      def show
+        STDERR.puts "Stack contents"
+        i = 0
+        # Swap the named dataset stuff
+        ## @todo Maybe a hash pair should be maintained in permanence ?
+        rev = {}
+        for k,v in @named_datasets
+          rev[v] = k
+        end
+
+        for ds in @stack
+          name = rev[ds]
+          if name
+            name = "(named: '#{name}')"
+          else
+            name = ""
+          end
+          
+          pref = sprintf("#%-2d %-3d:", i, - @stack.size + i)
+          
+          STDERR.puts " * #{pref} #{ds.name} -- #{ds.ys.size + 1} columns #{name}"
+          i += 1
+        end
+      end
+
       
     end
 
@@ -284,31 +335,82 @@ onto the stack, or the given stored dataset if the which option is given.
 EOH
 
     ConcatLastCommand = 
-      Cmd.new("join-datasets", nil, "--join-datasets", 
-              [], {'number' => CmdArg.new('integer')}) do |plotmaker, opts|
-      nb = opts['number'] || 2
-      plotmaker.data_stack.concatenate_datasets(nb)
+      Cmd.new("join-datasets", "-j", "--join-datasets", 
+              [], 
+              { 
+                'number' => CmdArg.new('integer'),
+                'which' => CmdArg.new('stored-dataset'),
+                'name' => CmdArg.new('text') 
+              }) do |plotmaker, opts|
+      stack = plotmaker.data_stack
+      datasets = stack.latest_datasets(opts)
+      stack.concatenate_datasets(datasets, opts['name'])
     end
     
     ConcatLastCommand.describe("Concatenates the last datasets on the stack",
                                <<EOH, DataStackGroup)
 Pops the last two (or number, if it is specified) datasets from the
 stack, concatenates them (older last) and push them back onto the
-stack.
+stack. The name option can be used to give a name to the new dataset. 
 EOH
 
+    ApplyLastCommand =
+      Cmd.new("apply-formula", '', "--apply-formula",
+              [CmdArg.new('text')], 
+              {
+                'which' => CmdArg.new('stored-dataset'),
+                'name' => CmdArg.new('text'),
+              }) do |plotmaker, formula, opts|
+      ds = plotmaker.data_stack.specified_dataset(opts)
+      newds = ds.apply_formulas(formula)
+      plotmaker.data_stack.add_datasets([newds], opts)
+    end
+    
+    ApplyLastCommand.describe("Applies a formula to the last dataset",
+                              <<EOH, DataStackGroup)
+Applies a formula to the last dataset (or the named one)
+EOH
 
+    ShowStackCommand = 
+      Cmd.new("show-stack", nil, "--show-stack", 
+              [], 
+              { }
+              ) do |plotmaker, opts|
+      plotmaker.data_stack.show
+    end
+    
+    ShowStackCommand.describe("Displays the content of the stack",
+                              <<EOH, DataStackGroup)
+Displays the current contents of the dataset stack. 
+
+Mostly used for debugging when operations like {cmd: merge-datasets}
+or {cmd: join-datasets} don't work as expected.
+EOH
+
+
+    ## @todo Add column selection ?
     MergeToLastCommand = 
       Cmd.new("merge-datasets", nil, "--merge-datasets", 
-              [], {'number' => CmdArg.new('integer')}) do |plotmaker, opts|
-      nb = opts['number'] || 2
-      ## @todo all
-      plotmaker.data_stack.merge_datasets(nb)
+              [], 
+              {
+                'number' => CmdArg.new('integer'), 
+                'which' => CmdArg.new('stored-dataset')
+              }
+              ) do |plotmaker, opts|
+      stack = plotmaker.data_stack
+      datasets = stack.latest_datasets(opts)
+      plotmaker.data_stack.merge_datasets_into_last(datasets)
     end
     
-    MergeToLastCommand.describe("....",
-                               <<EOH, DataStackGroup)
-....
+    MergeToLastCommand.describe("Merge datasets based on X column",
+                                <<EOH, DataStackGroup)
+This commands merges data with matching X values from a dataset (by
+default the one before the last) into the last one. Data points that
+have no corresponding X value in the current dataset are simply
+ignored.
+
+This can be used to build 3D datasets for {cmd: xyz-map} or 
+{cmd: xy-parametric}.
 EOH
 
     XYReglinCommand = 
@@ -325,7 +427,31 @@ EOH
     
     XYReglinCommand.describe("....",
                              <<EOH, DataStackGroup)
-....
+...
+
+This command will get documented some day.
+EOH
+
+
+    ComputeContourCommand = 
+      Cmd.new("compute-contour", nil, "--compute-contour", 
+              [CmdArg.new("float")], {
+                'which' => CmdArg.new('stored-dataset')
+              }) do |plotmaker, level, opts|
+      stack = plotmaker.data_stack
+      ds = stack.specified_dataset(opts)
+      f = ds.make_contour(level)
+      newds = Dataset.new("Contour #{level}", [f.x, f.y])
+      stack.store_dataset(newds, true)
+    end
+    
+    ComputeContourCommand.describe("computes the contour and push it to data stack",
+                             <<EOH, DataStackGroup)
+Computes the contour at the given level for the given dataset (or the
+last on the stack if none is specified) and pushes it onto the data
+stack.
+
+You can further manipulate it as usual.
 EOH
 
     SetDatasetHookCommand = 

data/lib/ctioga2/git-fools-svn.rb

@@ -0,0 +1,7 @@
+# Automatically generated file.
+module CTioga2
+
+
+   Version::register_svn_info('$Revision: 312$', 
+                              '$Date: Mon Apr 16 21:55:21 2012 +0000$')
+end

data/lib/ctioga2/graphics/coordinates.rb

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 177 $', '$Date: 2010-10-25 13:22:39 +0200 (Mon, 25 Oct 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Graphics
 

data/lib/ctioga2/graphics/elements.rb

@@ -29,7 +29,7 @@ require 'ctioga2/graphics/elements/contour'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 288 $', '$Date: 2011-02-22 21:12:58 +0100 (Tue, 22 Feb 2011) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Graphics
 

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 155 $', '$Date: 2010-06-21 21:41:32 +0200 (Mon, 21 Jun 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Graphics
 

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

@@ -1,5 +1,5 @@
 # contour.rb: contouring code for XYZ data
-# copyright (c) 2009 by Vincent Fourmond
+# copyright (c) 2010, 2011 by Vincent Fourmond
   
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@ require 'ctioga2/graphics/elements/primitive'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 192 $', '$Date: 2010-11-07 18:07:01 +0100 (Sun, 07 Nov 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Graphics
 
@@ -36,6 +36,9 @@ module CTioga2
         # $last_curve_style calls for a context for the primitive, ie
         # which was the state of the dataset/curve stack at the moment
         # when the primitive was drawn ?
+        #
+        # Worse, I already designed something better. I'll need to get
+        # that straight some day.
         TiogaPrimitiveCall.
           primitive("contour", "contour", [ 'level'],
                     ContoursOptions) do |t, level,options|