tioga 1.11 → 1.13

data/{split/Tioga → ext/Tioga/FigureMaker}/wrappers.c

@@ -77,7 +77,7 @@ OBJ_PTR FM_private_make_portfolio(OBJ_PTR fmkr, OBJ_PTR name, OBJ_PTR fignums, O
 // makers.c
 OBJ_PTR FM_private_make_contour(OBJ_PTR fmkr, OBJ_PTR gaps,
   OBJ_PTR xs, OBJ_PTR ys, OBJ_PTR zs, OBJ_PTR z_level, OBJ_PTR legit, OBJ_PTR method) { int ierr=0; 
-     return c_private_make_contour(fmkr, Get_FM(fmkr, &ierr), gaps, xs, ys, zs, Number_to_double(z_level, &ierr),
+     return c_private_make_contour(Qnil, NULL, gaps, xs, ys, zs, Number_to_double(z_level, &ierr),
         legit, Number_to_int(method, &ierr), &ierr); }
 OBJ_PTR FM_private_make_steps(OBJ_PTR fmkr, OBJ_PTR Xvec_data, OBJ_PTR Yvec_data,
      OBJ_PTR xfirst, OBJ_PTR yfirst, OBJ_PTR xlast, OBJ_PTR ylast) { int ierr=0;
@@ -120,9 +120,9 @@ OBJ_PTR FM_get_color_from_colormap(OBJ_PTR fmkr, OBJ_PTR color_map, OBJ_PTR colo
 OBJ_PTR FM_convert_to_colormap(OBJ_PTR fmkr, OBJ_PTR Rs, OBJ_PTR Gs, OBJ_PTR Bs) { int ierr=0;
    return c_convert_to_colormap(fmkr, Get_FM(fmkr, &ierr), Rs, Gs, Bs, &ierr); }
 OBJ_PTR FM_hls_to_rgb(OBJ_PTR fmkr, OBJ_PTR hls_vec) { int ierr=0;
-   return c_hls_to_rgb(fmkr, Get_FM(fmkr, &ierr), hls_vec, &ierr); }
+   return c_hls_to_rgb(Qnil, NULL, hls_vec, &ierr); }
 OBJ_PTR FM_rgb_to_hls(OBJ_PTR fmkr, OBJ_PTR rgb_vec) { int ierr=0;
-   return c_rgb_to_hls(fmkr, Get_FM(fmkr, &ierr), rgb_vec, &ierr); }
+   return c_rgb_to_hls(Qnil, NULL, rgb_vec, &ierr); }
 OBJ_PTR FM_title_color_set(OBJ_PTR fmkr, OBJ_PTR val) { int ierr=0;
    c_title_color_set(fmkr, Get_FM(fmkr, &ierr), val, &ierr); RETURN_NIL; }
 OBJ_PTR FM_title_color_get(OBJ_PTR fmkr) { int ierr=0;
@@ -155,11 +155,11 @@ OBJ_PTR FM_yaxis_labels_color_get(OBJ_PTR fmkr) { int ierr=0;
    return c_yaxis_labels_color_get(fmkr, Get_FM(fmkr, &ierr), &ierr); }
 
 OBJ_PTR FM_string_hls_to_rgb_bang(OBJ_PTR fmkr, OBJ_PTR str) { int ierr=0;
-   c_string_hls_to_rgb_bang(fmkr, Get_FM(fmkr, &ierr),  
+   c_string_hls_to_rgb_bang(Qnil, NULL,  
       (unsigned char *)String_Ptr(str, &ierr), String_Len(str, &ierr), &ierr);
    return str; }
 OBJ_PTR FM_string_rgb_to_hls_bang(OBJ_PTR fmkr, OBJ_PTR str) { int ierr=0;
-   c_string_rgb_to_hls_bang(fmkr, Get_FM(fmkr, &ierr), 
+   c_string_rgb_to_hls_bang(Qnil, NULL,
       (unsigned char *)String_Ptr(str, &ierr), String_Len(str, &ierr), &ierr);
    return str; }
 

data/{split → ext/includes}/symbols.c

@@ -20,7 +20,6 @@
 /* Simple code for sharing C symbols across different Ruby libraries */
 
 #include <ruby.h>
-#include <intern.h>
 
 #include <namespace.h>
 

data/{split/Dvector/lib → lib/Dobjects}/Dvector_extras.rb

@@ -84,6 +84,7 @@ module Dobjects
       'index_col' => false,
       'headers' => nil, # not used for now.
       'default' => 0.0/0.0, # defaults to NaN
+      'initial_size' => 5001,
       'remove_space' => true ,# removes spaces at the beginning of the lines
     }
 

data/{split/Tioga/lib → lib/Tioga}/FigMkr.rb

@@ -21,12 +21,16 @@
 =end
 
 require 'Tioga/FigureConstants.rb'
-require 'Tioga/Utils.rb'
+require 'Tioga/Utils'
 
 module Tioga
 class FigureMaker
     
     include FigureConstants
+
+    # For the parsing of Hash arguments
+    include HashArguments       # For instance methods
+    extend HashArguments        # For class methods
     
     @@default_figure_maker = nil
     @@which_pdflatex = nil
@@ -34,7 +38,7 @@ class FigureMaker
 
     # This URL will contain tioga-(...) when it is exported from the
     # SVN repository. This is where we'll look for version information.
-    SVN_URL = '$HeadURL: svn+ssh://rubyforge.org/var/svn/tioga/tags/tioga/Tioga%201.11/split/Tioga/lib/FigMkr.rb $'
+    SVN_URL = '$HeadURL$'
 
     TIOGA_VERSION = if SVN_URL =~ /tags\/tioga\/Tioga%20([^\/]+)/
                        $1
@@ -1297,7 +1301,12 @@ class FigureMaker
     
     @@keys_for_make_contour = FigureMaker.make_name_lookup_hash([
         'dest_xs', 'dest_ys', 'z_level', 'z', 'level', 'xs', 'ys', 'gaps', 'zs', 'data', 'legit', 'method'])
+    
     def make_contour(dict)
+      return FigureMaker.make_contour(dict)
+    end
+
+    def self.make_contour(dict)
         check_dict(dict, @@keys_for_make_contour, 'make_contour')
         z_level = dict['z_level']
         if z_level == nil
@@ -1328,7 +1337,7 @@ class FigureMaker
         
         method = dict['method']
         use_conrec = (method == 'conrec' or method == 'CONREC')? 1 : 0
-        pts_array = private_make_contour(gaps, xs, ys, zs, z_level, legit, use_conrec)
+        pts_array = FigureMaker.private_make_contour(gaps, xs, ys, zs, z_level, legit, use_conrec)
             
         unless dest_xs == nil
             dest_xs.resize(pts_array[0].size)
@@ -2516,73 +2525,7 @@ class FigureMaker
         end
         return false
     end
-    
-    def check_dict(dict,names,str)
-        dict.each_key do |name|
-            if names[name] == nil
-                raise "Sorry: Invalid dictionary key for #{str} (#{name})."
-            end
-        end
-    end
-    
-    def set_if_given(name, dict)
-        val = dict[name]
-        return if val == nil
-        eval "self." + name + " = val"
-    end
-        
-    def alt_names(dict, name1, name2)
-        val = dict[name1]
-        val = dict[name2] if val == nil
-        return val
-    end
-        
-    def get_if_given_else_use_default_dict(dict, name, default_dict)
-        if dict != nil
-            val = dict[name]
-            return val if val != nil
-        end
-        val = default_dict[name]
-        if val == nil
-            raise "Sorry: failed to find value for '#{name}' in the defaults dictionary."
-        end
-        return val
-    end
-    
-    def get_if_given_else_default(dict, name, default)
-        return default if dict == nil
-        val = dict[name]
-        return val if val != nil
-        return default
-    end
-    
-    def complain_if_missing_numeric_arg(dict, name, alt_name, who_called)
-        val = dict[name]
-        val = dict[alt_name] if val == nil
-        if val == nil
-            raise "Sorry: Must supply '#{name}' in call to '#{who_called}'"
-        end
-        if !(val.kind_of?Numeric)
-            raise "Sorry: Must supply numeric value for '#{name}' in call to '#{who_called}'"
-        end
-        return val
-    end
-    
-    def check_pair(ary, name, who_called)
-        return false if ary == nil
-        if !(ary.kind_of?(Array) || ary.kind_of?(Dvector)) and ary.size == 2
-            raise "Sorry: '#{name}' must be array [x,y] for #{who_called}."
-        end
-        return true
-    end
-    
-    def get_dvec(dict, name, who_called)
-        val = dict[name]
-        if val == nil || !(val.kind_of? Dvector)
-            raise "Sorry: '#{name}' must be a Dvector for '#{who_called}'"
-        end
-        return val
-    end
+
 
     # We make sure that save_dir exists and is a directory, creating it
     # if necessary.

data/{split/Tioga/lib → lib/Tioga}/Utils.rb

@@ -82,4 +82,78 @@ module Tioga
 
 
   end
+
+
+  # This module is used internally by Tioga for handling the hash
+  # arguments that most of the functions take
+  module HashArguments
+
+    def check_dict(dict,names,str)
+        dict.each_key do |name|
+            if names[name] == nil
+                raise "Sorry: Invalid dictionary key for #{str} (#{name})."
+            end
+        end
+    end
+    
+    def set_if_given(name, dict)
+        val = dict[name]
+        return if val == nil
+        eval "self." + name + " = val"
+    end
+        
+    def alt_names(dict, name1, name2)
+        val = dict[name1]
+        val = dict[name2] if val == nil
+        return val
+    end
+        
+    def get_if_given_else_use_default_dict(dict, name, default_dict)
+        if dict != nil
+            val = dict[name]
+            return val if val != nil
+        end
+        val = default_dict[name]
+        if val == nil
+            raise "Sorry: failed to find value for '#{name}' in the defaults dictionary."
+        end
+        return val
+    end
+    
+    def get_if_given_else_default(dict, name, default)
+        return default if dict == nil
+        val = dict[name]
+        return val if val != nil
+        return default
+    end
+    
+    def complain_if_missing_numeric_arg(dict, name, alt_name, who_called)
+        val = dict[name]
+        val = dict[alt_name] if val == nil
+        if val == nil
+            raise "Sorry: Must supply '#{name}' in call to '#{who_called}'"
+        end
+        if !(val.kind_of?Numeric)
+            raise "Sorry: Must supply numeric value for '#{name}' in call to '#{who_called}'"
+        end
+        return val
+    end
+
+    def check_pair(ary, name, who_called)
+        return false if ary == nil
+        if !(ary.kind_of?(Array) || ary.kind_of?(Dobjects::Dvector)) and ary.size == 2
+            raise "Sorry: '#{name}' must be array [x,y] for #{who_called}."
+        end
+        return true
+    end
+    
+    def get_dvec(dict, name, who_called)
+        val = dict[name]
+        if val == nil || !(val.kind_of? Dobjects::Dvector)
+            raise "Sorry: '#{name}' must be a Dvector for '#{who_called}'"
+        end
+        return val
+    end
+
+  end
 end

data/tests/benchmark_dvector_reads.rb

@@ -1,5 +1,7 @@
 # A small benchmarking file for fancy_read and fast_fancy_read, just to make
 # sure the latter deserves its name ;-)...
+#
+# Now the comparison between fancy_read and fast_fancy_read 
 
 require 'Dobjects/Dvector'
 require 'benchmark'
@@ -15,55 +17,41 @@ Benchmark.bm do |x|
     end
     f.close
   end
-  x.report("fancy_read(100000):") do 
+  x.report("fancy_read(100 000):") do 
     stream = File.open(f.path)
     Dobjects::Dvector.fancy_read(stream, nil, 'default'=> 0.0).size
   end
-  x.report("fancy_read(100000, 2nd):") do 
+  x.report("fancy_read(100 000), 2nd time:") do 
     stream = File.open(f.path)
     Dobjects::Dvector.fancy_read(stream, nil, 'default'=> 0.0).size
   end
-  x.report("fast_fancy_read(100000):") do 
+
+  # Trying pre-allocation.
+  x.report("fancy_read(100 000), preallocation to 1 :") do 
+    stream = File.open(f.path)
+    Dobjects::Dvector.fancy_read(stream, nil, 'default'=> 0.0, 
+                                 'initial_size' => 1).size
+  end
+  x.report("fancy_read(100 000), preallocation to 49999 :") do 
     stream = File.open(f.path)
-    Dobjects::Dvector.fast_fancy_read(stream, {
-                                        'sep' => /\s+/,
-                                        'comments' => /^\s*\#/,
-                                        'skip_first' => 0,
-                                        'index_col' => false,
-                                        'remove_space' => true,
-                                        'default'=> 0.0}).size
+    Dobjects::Dvector.fancy_read(stream, nil, 'default'=> 0.0, 
+                                 'initial_size' => 49999).size
   end
-  x.report("fast_fancy_read(100000, 2nd):") do 
+  x.report("fancy_read(100 000), preallocation to 100 000 :") do 
     stream = File.open(f.path)
-    Dobjects::Dvector.fast_fancy_read(stream, {
-                                        'sep' => /\s+/,
-                                        'comments' => /^\s*\#/,
-                                        'skip_first' => 0,
-                                        'index_col' => false,
-                                        'remove_space' => true,
-                                        'default'=> 0.0}).size
+    Dobjects::Dvector.fancy_read(stream, nil, 'default'=> 0.0, 
+                                 'initial_size' => 100000).size
   end
+
   # We create a smaller file:
   f = Tempfile.new("data")
   1000.times do |i|
     f.puts "#{i*1.0}\t#{i**1.3}\t#{i**0.7}"
   end
   f.close
-  x.report("fast_fancy_read(100 * 1000):") do 
-    stream = File.open(f.path)
-    100.times do 
-      Dobjects::Dvector.fast_fancy_read(stream, {
-                                          'sep' => /\s+/,
-                                          'comments' => /^\s*\#/,
-                                          'skip_first' => 0,
-                                          'index_col' => false,
-                                          'remove_space' => true,
-                                          'default'=> 0.0})
-    end
-  end
   x.report("fancy_read(100 * 1000):") do 
-    stream = File.open(f.path)
     100.times do 
+      stream = File.open(f.path)
       Dobjects::Dvector.fancy_read(stream, nil, 'default'=> 0.0)
     end
   end
@@ -72,23 +60,13 @@ Benchmark.bm do |x|
   string = ""
   x.report("string creation:") do 
     50000.times do |i|
-      string += "#{i*1.0}\t#{i**1.3}\t#{i**0.7}\n"
+      string.concat("#{i*1.0}\t#{i**1.3}\t#{i**0.7}\n")
     end
   end
   x.report("fancy_read(50000):") do 
     stream = StringIO.new(string)
     Dobjects::Dvector.fancy_read(stream, nil, 'default'=> 0.0).size
   end
-  x.report("fast_fancy_read(50000):") do 
-    stream = StringIO.new(string)
-    Dobjects::Dvector.fast_fancy_read(stream, {
-                                        'sep' => /\s+/,
-                                        'comments' => /^\s*\#/,
-                                        'skip_first' => 0,
-                                        'index_col' => false,
-                                        'remove_space' => true,
-                                        'default'=> 0.0}).size
-  end
 
 end