ctioga2 0.2 → 0.3

data/Changelog

@@ -1,3 +1,14 @@
+ctioga2 (0.3)
+
+  * Implemented a compute-contour command to directly manipulate contours
+  * Scripts now import environment variables (makefile-style)
+  * Added an apply-formula command to modify already loaded datasets
+  * Added a direct backend to input a couple of points directly on
+    command-line
+  * Improved the stack manipulation functions
+
+ -- Vincent Fourmond <vincent.fourmond@9online.fr>  Mon Sep  3 21:10:34 CEST 2012
+
 ctioga2 (0.2)
 
   * Fix small details in the legend positioning in the 'outside' scheme

data/lib/ctioga2/commands/arguments.rb

@@ -16,7 +16,7 @@ require 'ctioga2/commands/type'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 18 $', '$Date: 2009-04-28 23:43:54 +0200 (Tue, 28 Apr 2009) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Commands
 

data/lib/ctioga2/commands/commands.rb

@@ -17,7 +17,7 @@ require 'ctioga2/commands/groups'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 144 $', '$Date: 2010-04-06 13:31:39 +0200 (Tue, 06 Apr 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Commands
 

data/lib/ctioga2/commands/doc/doc.rb

@@ -17,7 +17,7 @@ require 'ctioga2/commands/doc/markup'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 138 $', '$Date: 2010-01-21 22:39:55 +0100 (Thu, 21 Jan 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Commands
 

data/lib/ctioga2/commands/doc/documentation-commands.rb

@@ -20,7 +20,7 @@ require 'ctioga2/commands/doc/markup'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 106 $', '$Date: 2009-10-21 01:31:34 +0200 (Wed, 21 Oct 2009) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Commands
 

data/lib/ctioga2/commands/doc/help.rb

@@ -18,7 +18,7 @@ require 'ctioga2/commands/doc/wordwrap'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 132 $', '$Date: 2010-01-14 23:18:19 +0100 (Thu, 14 Jan 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Commands
 

data/lib/ctioga2/commands/doc/html.rb

@@ -16,7 +16,7 @@ require 'ctioga2/commands/commands'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 216 $', '$Date: 2010-12-31 16:18:17 +0100 (Fri, 31 Dec 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Commands
 

data/lib/ctioga2/commands/doc/introspection.rb

@@ -16,7 +16,7 @@ require 'ctioga2/commands/commands'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 238 $', '$Date: 2011-01-23 21:58:08 +0100 (Sun, 23 Jan 2011) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Commands
 

data/lib/ctioga2/commands/doc/man.rb

@@ -18,7 +18,7 @@ require 'ctioga2/commands/parsers/command-line'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 213 $', '$Date: 2010-12-31 02:50:00 +0100 (Fri, 31 Dec 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Commands
 

data/lib/ctioga2/commands/doc/markup.rb

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 216 $', '$Date: 2010-12-31 16:18:17 +0100 (Fri, 31 Dec 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Commands
 

data/lib/ctioga2/commands/doc/wordwrap.rb

@@ -17,7 +17,7 @@ require 'ctioga2/commands/parsers/command-line'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 131 $', '$Date: 2010-01-14 22:51:09 +0100 (Thu, 14 Jan 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Commands
 

data/lib/ctioga2/commands/general-commands.rb

@@ -17,7 +17,7 @@ require 'ctioga2/commands/parsers/file'
 
 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 Commands
  

data/lib/ctioga2/commands/general-types.rb

@@ -15,7 +15,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 223 $', '$Date: 2011-01-11 01:07:48 +0100 (Tue, 11 Jan 2011) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Commands
  

data/lib/ctioga2/commands/groups.rb

@@ -16,7 +16,7 @@ require 'ctioga2/metabuilder/types'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 14 $', '$Date: 2009-04-27 21:49:16 +0200 (Mon, 27 Apr 2009) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Commands
 

data/lib/ctioga2/commands/interpreter.rb

@@ -20,7 +20,7 @@ require 'ctioga2/commands/doc/doc'
 
 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$')
 
   # This module contains the real core of ctioga2: a set of classes
   # that implement the concept of commands. Each command translates
@@ -180,6 +180,12 @@ module CTioga2
         @doc = Documentation::Doc.new()
         @variables = Variables.new
 
+        # We import the variables from the environment, just like a in
+        # a Makefile
+        for k, v in ENV
+          @variables.define_variable(k, v)
+        end
+
         @file_parser = Parsers::FileParser.new
       end
 
@@ -196,10 +202,10 @@ module CTioga2
       # the base name of the given file if no figure name was
       # specified.
       def run_command_file(file)
-        @file_parser.run_command_file(file, self)
         if ! @plotmaker_target.figure_name
           @plotmaker_target.figure_name = file.gsub(/\.[^.]+$/,'')
         end
+        @file_parser.run_command_file(file, self)
       end
 
       # Parses and runs the given string.

data/lib/ctioga2/commands/parsers/command-line.rb

@@ -17,7 +17,7 @@ require 'ctioga2/commands/commands'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 151 $', '$Date: 2010-06-19 23:45:20 +0200 (Sat, 19 Jun 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Commands
 

data/lib/ctioga2/commands/parsers/file.rb

@@ -19,7 +19,7 @@ require 'ctioga2/commands/strings'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 151 $', '$Date: 2010-06-19 23:45:20 +0200 (Sat, 19 Jun 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Commands
 
@@ -70,6 +70,9 @@ module CTioga2
         def parse_io_object(io, interpreter)
           # The process is simple: we look for symbols and
           # corresponding syntax element: parentheses or assignments
+
+          ## @todo It would be really great if assignments could be
+          ## made conditional (a bit like in makefiles)
           while(1)
             symbol = up_to_next_symbol(io)
             break if not symbol

data/lib/ctioga2/commands/strings.rb

@@ -16,7 +16,7 @@ require 'stringio'              # For debugging purposes
 
 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 Commands
 

data/lib/ctioga2/commands/type.rb

@@ -16,7 +16,7 @@ require 'ctioga2/metabuilder/types'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 173 $', '$Date: 2010-10-22 21:41:39 +0200 (Fri, 22 Oct 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Commands
 

data/lib/ctioga2/commands/variables.rb

@@ -16,7 +16,7 @@ require 'ctioga2/commands/strings'
 
 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 Commands
 
@@ -32,7 +32,6 @@ module CTioga2
     # There are two kind of variables
     # * immediate, defined by
     #    variable := value
-    #   or
     #   These ones are evaluated for once when they are defined.
     #   They are stored in the form of a String
     # * recursively expanded variables. They are mostly like immediate
@@ -57,10 +56,11 @@ module CTioga2
       end
 
       # Sets a the variable _name_ to _value_ (being an
-      # InterpreterString or a String). If _interpreter_ is given, the
-      # value is expanded at the time of the definition, (immediate
-      # variable), whereas if it stays _nil_, the variable is defined
-      # as a recursively defined variable.
+      # InterpreterString or a String). In the former case
+      # (InterpreterString), if _interpreter_ is given, the value is
+      # expanded at the time of the definition, (immediate variable),
+      # whereas if it stays _nil_, the variable is defined as a
+      # recursively defined variable.
       def define_variable(name, value, interpreter = nil)
         if value.respond_to? :expand_to_string
           if interpreter

data/lib/ctioga2/data/backends/backend.rb

@@ -21,7 +21,7 @@ require 'ctioga2/data/backends/description'
 
 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 Data

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

@@ -17,6 +17,7 @@
 
 
 require 'ctioga2/data/backends/backend'
+require 'ctioga2/log'
 
 # We try to look for all files under a ctioga2/metabuilder/types
 # directory anywhere on the $: path
@@ -33,7 +34,7 @@ for file in files.uniq
   begin
     require "ctioga2/data/backends/backends/#{file}"
   rescue Exception => e
-    warn { "There was a problem trying to load 'ctioga2/data/backends/backends/#{file}': "  }
-    warn { "#{e.inspect}" }
+    CTioga2::Log::warn { "There was a problem trying to load 'ctioga2/data/backends/backends/#{file}': "  }
+    CTioga2::Log::warn { "#{e.inspect}" }
   end
 end

data/lib/ctioga2/data/backends/backends/direct.rb

@@ -0,0 +1,72 @@
+# text.rb : A simple backend to deal with basic text files.
+# Copyright (C) 2006 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+
+require 'Dobjects/Dvector'
+require 'Dobjects/Function'
+
+# For separated sets
+require 'stringio'
+
+module CTioga2
+
+  Version::register_svn_info('$Revision$', '$Date$')
+
+
+  module Data
+
+    module Backends
+
+      class DirectBackend < Backend
+
+        include Dobjects
+
+        describe 'direct', 'Direct format', <<EOD
+A backend where one enters data points directly on the command
+line or in the command file
+EOD
+
+        def initialize
+          @separator = /\s+/
+          @line_separator = /[;,]/
+          super()
+        end
+
+        protected
+
+
+
+        # This is called by the architecture to get the data. It
+        # splits the set name into filename@cols, reads the file if
+        # necessary and calls get_data
+        def query_dataset(set)
+          str = set.gsub(@line_separator, "\n")
+          io = StringIO.new(str)
+          
+          cols = Dvector::fancy_read(io, nil)
+
+          return Dataset.new("direct", cols)
+        end
+
+
+      end
+      
+    end
+
+  end
+end

data/lib/ctioga2/data/backends/backends/gnuplot.rb

@@ -25,7 +25,7 @@ require 'stringio'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 151 $', '$Date: 2010-06-19 23:45:20 +0200 (Sat, 19 Jun 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
 
   module Data

data/lib/ctioga2/data/backends/backends/math.rb

@@ -21,7 +21,7 @@ require 'Dobjects/Function'
 
 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 Data
 

data/lib/ctioga2/data/backends/backends/text.rb

@@ -25,7 +25,7 @@ require 'stringio'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 191 $', '$Date: 2010-11-07 15:53:08 +0100 (Sun, 07 Nov 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
 
   module Data
@@ -55,7 +55,7 @@ module CTioga2
         include Dobjects
 
         describe 'text', 'Text format', <<EOD
-This backend can read text files in a format close to the one understood
+This backend reads text files in a format close to the one understood
 by gnuplot and the like.
 EOD
 
@@ -289,6 +289,11 @@ EOD
         # instance in the automatic labels ? (and we could have fun
         # improving this one ?)
         #
+        # @todo There should be a way to read pure text columns and
+        # use them somehow, to annotate the output ? This should be
+        # implemented at the Tioga level, though (both for reading, in
+        # fancy_read, and for using hover stuff)
+        #
         # \warning This needs Tioga r561
         def read_file(file)
           if file =~ /(.*)@.*/
@@ -361,18 +366,7 @@ EOD
         def get_data_column(column, compute_formulas = false, 
                             parameters = nil, header = nil)
           if compute_formulas
-            formula = column
-            if parameters
-              for k,v in parameters
-                formula.gsub!(/\b#{k}\b/, v.to_s)
-              end
-            end
-            formula.gsub!(/\$(\d+)/, 'column[\1]')
-            if header
-              for k,v in header
-                formula.gsub!("$#{k}$", "column[#{v}]")
-              end
-            end
+            formula = Utils::parse_formula(column, parameters, header)
             debug { "Using formula #{formula} for column spec: #{column}" }
             return Dvector.compute_formula(formula, 
                                            @current_data,

data/lib/ctioga2/data/backends/description.rb

@@ -22,7 +22,7 @@ require 'ctioga2/commands/groups'
 
 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 Data
@@ -179,10 +179,14 @@ module CTioga2
                   backend_options, "Selects the '{backend: #{@name}}' backend", 
                   nil, group) do |plotmaker, options|
             plotmaker.data_stack.backend_factory.set_current_backend(@name)
-            for k,v in options
-              plotmaker.data_stack.backend_factory.
-                set_backend_parameter_value(@name, k, v)
-            end
+            if options
+              for k,v in options
+                plotmaker.data_stack.backend_factory.
+                  set_backend_parameter_value(@name, k, v)
+              end 
+            end               # Commands#run_command set options to
+            # nil if the options hash is an empty hash, so we have to
+            # tackle this if it happens
           end
         end