tioga 1.8 → 1.9

data/Tioga_README

@@ -21,14 +21,41 @@ This is the README for the Tioga kernel, version 1.8, April 4, 2008.
 
 << What's new >>
 
-    Version 1.8 is essentially a cleanup/bug fix release. Tioga now compiles
-with hardly any warnings, thanks to the work by Taro Sato. show_axis can now
-take a hash instead of a simple location, and can draw axes basically
-anywhere. See the axes_fun function in samples/plots/plots.rb and
-show_axis documentation. Few bugs were fixed, in particular the
-position of ticks with ticks_inside/ticks_outside, and the
-installation via Rubygems which was broken for such a long time we are
-ashamed of it. 
+  Version 1.9: 
+
+  zlib's source has been included again to fix compilation problems on
+MacOS. The embedded copy will only be used if tioga does not manage to
+link to the system one.
+
+  It is now possible to use directly a HLS image using 'color_space' =
+'HLS' as argument to show_image.
+
+  A new ticks placement algorithm was written. You can benefit from it
+by saying t.vincent_or_bill = true.
+
+  You can now use the optional argument to show_legend to draw a
+background (or anything else) to a legend. The information given to
+the callback will only be accurate if t.measure_legends = true. See
+samples/plots.rb
+(Legend_Inside_with_Background_using_legend_background) for more
+information. Accordingly, you can use legend_text_width to know the
+legend's text maximal width. 
+
+  A new utility function was written, show_grid, that draws a grid
+according to major and optionally minor ticks of the current axes.
+
+  show_marker can now take arrays for 'marker' and 'color', and cycles
+through them while plotting.
+
+  Some top-level convenience functions have been added:
+FigureMaker.exec, FigureMaker.make_pdf,
+FigureMaker.def_enter_page_function, FigureMaker.page_style that work
+on the default FigureMaker.
+
+  show_plot_without_clipping, obviously a non-clipping version of
+show_plot.
+
+  And all corresponding demonstrations in the samples/ directory !
 
 
 << Quick Installation of Tioga >>
@@ -177,6 +204,17 @@ Bill Paxton
 
 Here are the old release messages:
 
+--------------------------
+
+    Version 1.8 is essentially a cleanup/bug fix release. Tioga now compiles
+with hardly any warnings, thanks to the work by Taro Sato. show_axis can now
+take a hash instead of a simple location, and can draw axes basically
+anywhere. See the axes_fun function in samples/plots/plots.rb and
+show_axis documentation. Few bugs were fixed, in particular the
+position of ticks with ticks_inside/ticks_outside, and the
+installation via Rubygems which was broken for such a long time we are
+ashamed of it. 
+
 
 --------------------------
 
@@ -205,9 +243,6 @@ than before.
 
     Code should now compile cleanly with Ruby 1.9.
 
-
-
-
 --------------------------
 
    Version 1.6 adds numeric label "frequency" and "phase" attributes for

data/split/Dtable/dtable.c

@@ -1843,6 +1843,7 @@ PUBLIC void Init_Dtable() {
 
    /* nonstandard math functions */
    rb_define_method(cDtable, "neg", dtable_neg, 0);
+   rb_define_alias(cDtable, "-@", "neg");
    rb_define_method(cDtable, "exp10", dtable_exp10, 0);
    rb_define_method(cDtable, "inv", dtable_inv, 0);
    rb_define_method(cDtable, "trim", dtable_trim, -1);
@@ -1914,8 +1915,7 @@ PUBLIC void Init_Dtable() {
    RB_EXPORT_SYMBOL(cDtable, Dtable_Ptr);
 
    /* now we import the symbols from Dvector */
-
-   VALUE cDvector = rb_define_class_under(mDobjects, "Dvector", rb_cObject);
+   VALUE cDvector = rb_const_get(mDobjects, rb_intern("Dvector"));
    RB_IMPORT_SYMBOL(cDvector, Dvector_Create);
    RB_IMPORT_SYMBOL(cDvector, Dvector_Data_Resize);
    RB_IMPORT_SYMBOL(cDvector, Dvector_Data_Replace);

data/split/Dtable/dvector.h

@@ -31,6 +31,13 @@
 
 /* functions for handling Dvectors: */
 
+DECLARE_SYMBOL(bool, isa_Dvector, (VALUE obj));
+ /* returns true if the obj is a Dvector */
+DECLARE_SYMBOL(long, len_Dvector, (VALUE dvector));
+ /* returns length of the dvector */
+DECLARE_SYMBOL(double, access_Dvector, (VALUE dvector, long idx));
+ /* returns the value of entry idx in dvector */
+
 DECLARE_SYMBOL(double *, Dvector_Data_for_Read, (VALUE dvector, long *len_ptr));
  /* returns pointer to the dvector's data (which may be shared) */
 DECLARE_SYMBOL(double *, Dvector_Data_Copy, (VALUE dvector, long *len_ptr)); 
@@ -46,6 +53,7 @@ DECLARE_SYMBOL(void, Dvector_Store_Double, (VALUE ary, long idx, double val));
 /* pushes one element onto the vector */
 DECLARE_SYMBOL(void, Dvector_Push_Double, (VALUE ary, double val));
 
+
 /* functions for interpolation */
 DECLARE_SYMBOL(double, c_dvector_spline_interpolate,
 	       (double x, int n_pts_data, double *Xs, double *Ys, 

data/split/Dtable/namespace.h

@@ -21,27 +21,35 @@
 #ifndef _NAMESPACE_H
 #define _NAMESPACE_H
 
-/* This header file provides two OS-specific macros for the definition of
-   extern symbols:
+/* This header file provides three OS-specific macros for the definition of
+   extern (or NOT extern) symbols:
 
    * PUBLIC, which has to be used to mark objects that will be used
-   outside the module
+     outside the module
 
-   * PRIVATE, for symbols which are "extern" but intern to the module
+   * INTERN, for symbols which are shared among compilation units within a
+     module, but are NOT exported to other modules.
+
+   * PRIVATE, for symbols which are visible only within the containing
+     compilation unit (i.e. C source file) and, of course, are not exported to
+     other modules.
 
    Please don't add "extern" after the PRIVATE or PUBLIC declaration
    as this would break compilation on Darwin.
 */
 
-#ifdef __APPLE__
+#if __GNUC__ >= 4 /* we have the visibility attribute */
+# define INTERN __attribute__ ((visibility ("hidden")))
+# define PUBLIC __attribute__ ((visibility ("default"))) 
+# define INTERN_EXTERN extern
+#elif defined __APPLE__
 # define INTERN __private_extern__
 # define PUBLIC 
-#elif __GNUC__ >= 4 /* we have the visibility attribute */
-# define INTERN __attribute__ ((visibility ("hidden"))) 
-# define PUBLIC __attribute__ ((visibility ("default"))) 
+# define INTERN_EXTERN
 #else /* not really good */
 # define INTERN
 # define PUBLIC 
+# define INTERN_EXTERN
 #endif /* __APPLE__  and __GNU_C_ >= 4*/
 
 /* In any case, PRIVATE is static */

data/split/Dtable/symbols.h

@@ -22,7 +22,7 @@ PRIVATE void * rb_import_symbol_no_raise(VALUE module,
 		   
 #define DECLARE_SYMBOL(ret_type,name,args) \
   typedef ret_type (*rb_export_##name##_type) args;\
-  INTERN rb_export_##name##_type name
+  INTERN INTERN_EXTERN rb_export_##name##_type name
 
 #define IMPLEMENT_SYMBOL(name)\
   INTERN rb_export_##name##_type name = 0;

data/split/Dvector/dvector.c

@@ -1971,6 +1971,53 @@ VALUE dvector_delete_at_m(VALUE ary, VALUE pos) {
     return dvector_delete_at(ary, NUM2LONG(pos));
 }
 
+PRIVATE
+/*
+ *  call-seq:
+ *     dvector.prune(lst)  -> dvector
+ *  
+ *  Creates a new dvector without the entries given by the indexes in _lst_.
+ *     
+ *     a = Dvector.new(5) {|i| i*3 }    -> [0, 3, 6, 9, 12]
+ *     a.prune([0, 2])                  -> [3, 9, 12]
+ *     a                                -> [0, 3, 6, 9, 12]
+ */ 
+VALUE dvector_prune(VALUE ary, VALUE lst) {
+   ary = dvector_dup(ary);
+   dvector_prune_bang(ary, lst);
+   return ary;
+}
+
+PRIVATE
+/*
+ *  call-seq:
+ *     dvector.prune!(lst)  -> dvector
+ *  
+ *  Modifies the dvector by removing the entries given by the indexes in _lst_.
+ *     
+ *     a = Dvector.new(5) {|i| i*3 }    -> [0, 3, 6, 9, 12]
+ *     a.prune!([0, 2])                 -> [3, 9, 12]
+ *     a                                -> [3, 9, 12]
+ */ 
+VALUE dvector_prune_bang(VALUE ary, VALUE lst) {
+   Dvector *d;
+   d = dvector_modify(ary);
+   int i, lst_len, ary_len, pos, j;
+   VALUE *lst_ptr;
+   lst = rb_Array(lst);
+   lst_ptr = RARRAY(lst)->ptr;
+   lst_len = RARRAY(lst)->len;
+   for (i = lst_len-1; i >= 0; i--) {
+      ary_len = d->len;
+      pos = NUM2INT(lst_ptr[i]);  // remove this one from ary
+      for (j = pos+1; j < ary_len; j++, pos++) {
+         d->ptr[pos] = d->ptr[j];
+      }
+      d->len = pos;
+   }
+   return ary;
+}
+
 PRIVATE
 /*
  *  call-seq:
@@ -1999,7 +2046,8 @@ PRIVATE
 VALUE dvector_slice_bang(int argc, VALUE *argv, VALUE ary) {
    VALUE arg1, arg2;
    long pos, len;
-   Dvector *d = Get_Dvector(ary);
+   Dvector *d;
+   d = dvector_modify(ary);
    if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) {
       pos = NUM2LONG(arg1);
       len = NUM2LONG(arg2);
@@ -4533,7 +4581,7 @@ VALUE Read_Rows_of_Dvectors(char *filename, VALUE destinations, int first_row_of
    double v, *row_data;
    int buff_len = 1000;
    char *buff, *num_str, *pend, c, *cptr;
-   int num_rows = 0, i, row, col, buff_loc, c_loc, skip = first_row_of_file - 1;
+   int num_rows = 0, i, row, col, buff_loc, skip = first_row_of_file - 1;
    rows_obj = rb_Array(destinations);
    num_rows = RARRAY(rows_obj)->len;
    rows_ptr = RARRAY(rows_obj)->ptr;
@@ -4740,6 +4788,27 @@ VALUE dvector_read_row(int argc, VALUE *argv, VALUE klass) {
 
 /* C API functions */
 
+bool isa_Dvector(VALUE dvector) {
+   return Is_Dvector(dvector); 
+   }
+
+long len_Dvector(VALUE dvector) {
+   Dvector *d = Get_Dvector(dvector);
+   return d->len;
+   }
+
+double access_Dvector(VALUE dvector, long offset) {
+   Dvector *d = Get_Dvector(dvector);
+   if (d->len == 0) return 0.0;
+   if (offset < 0) {
+      offset += d->len;
+   }
+   if (offset < 0 || d->len <= offset) {
+      return 0.0;
+   }
+   return d->ptr[offset];
+   } 
+
 double *Dvector_Data_for_Read(VALUE dvector, long *len_ptr) { /* returns pointer to the dvector's data (which may be shared) */
    Dvector *d = Get_Dvector(dvector);
    if(len_ptr)
@@ -5522,6 +5591,8 @@ void Init_Dvector() {
    rb_define_method(cDvector, "sort!", dvector_sort_bang, 0);
    rb_define_method(cDvector, "collect", dvector_collect, 0);
    rb_define_method(cDvector, "collect!", dvector_collect_bang, 0);
+   rb_define_method(cDvector, "prune", dvector_prune, 1);
+   rb_define_method(cDvector, "prune!", dvector_prune_bang, 1);
    rb_define_alias(cDvector,  "map", "collect");
    rb_define_alias(cDvector,  "map!", "collect!");
    rb_define_method(cDvector, "dup", dvector_dup, 0);
@@ -5640,6 +5711,7 @@ void Init_Dvector() {
 
    /* nonstandard math functions */
    rb_define_method(cDvector, "neg", dvector_neg, 0);
+   rb_define_alias(cDvector, "-@", "neg");
    rb_define_method(cDvector, "exp10", dvector_exp10, 0);
    rb_define_method(cDvector, "inv", dvector_inv, 0);
    rb_define_method(cDvector, "trim", dvector_trim, -1);
@@ -5729,6 +5801,9 @@ void Init_Dvector() {
    /* now, the fun part: exporting binary symbols.
       see include/dvector.h for their meaning 
    */
+   RB_EXPORT_SYMBOL(cDvector, isa_Dvector);
+   RB_EXPORT_SYMBOL(cDvector, len_Dvector);
+   RB_EXPORT_SYMBOL(cDvector, access_Dvector);
    RB_EXPORT_SYMBOL(cDvector, Dvector_Data_for_Read);
    RB_EXPORT_SYMBOL(cDvector, Dvector_Data_Copy);
    RB_EXPORT_SYMBOL(cDvector, Dvector_Data_for_Write);

data/split/Dvector/dvector_intern.h

@@ -110,6 +110,8 @@ PRIVATE VALUE dvector_values_at(int argc, VALUE *argv, VALUE ary);
 PRIVATE VALUE dvector_select(VALUE ary);
 PRIVATE VALUE dvector_delete(VALUE ary, VALUE item);
 PRIVATE VALUE dvector_delete_at(VALUE ary, long pos);
+PRIVATE VALUE dvector_prune(VALUE ary, VALUE pos);
+PRIVATE VALUE dvector_prune_bang(VALUE ary, VALUE pos);
 PRIVATE VALUE dvector_slice_bang(int argc, VALUE *argv, VALUE ary);
 PRIVATE VALUE dvector_reject_bang(VALUE ary);
 PRIVATE VALUE dvector_reject(VALUE ary);

data/split/Dvector/include/dvector.h

@@ -31,6 +31,13 @@
 
 /* functions for handling Dvectors: */
 
+DECLARE_SYMBOL(bool, isa_Dvector, (VALUE obj));
+ /* returns true if the obj is a Dvector */
+DECLARE_SYMBOL(long, len_Dvector, (VALUE dvector));
+ /* returns length of the dvector */
+DECLARE_SYMBOL(double, access_Dvector, (VALUE dvector, long idx));
+ /* returns the value of entry idx in dvector */
+
 DECLARE_SYMBOL(double *, Dvector_Data_for_Read, (VALUE dvector, long *len_ptr));
  /* returns pointer to the dvector's data (which may be shared) */
 DECLARE_SYMBOL(double *, Dvector_Data_Copy, (VALUE dvector, long *len_ptr)); 
@@ -46,6 +53,7 @@ DECLARE_SYMBOL(void, Dvector_Store_Double, (VALUE ary, long idx, double val));
 /* pushes one element onto the vector */
 DECLARE_SYMBOL(void, Dvector_Push_Double, (VALUE ary, double val));
 
+
 /* functions for interpolation */
 DECLARE_SYMBOL(double, c_dvector_spline_interpolate,
 	       (double x, int n_pts_data, double *Xs, double *Ys, 

data/split/Dvector/lib/Dvector_extras.rb

@@ -39,6 +39,18 @@ module Dobjects
   end
 
   class Dvector
+  
+    # thanks to Dave MacMahon for from_na and to_na
+    # Create a Dvector from an NArray.
+    def Dvector.from_na(na)
+      _load([1, na.length, na.to_s].pack('CIa*'))
+    end
+
+    # Create an NArray with the same length and contents as +self+.
+    def to_na
+      ::NArray.to_na(_dump(nil)[5..-1], ::NArray::DFLOAT)
+    end
+    
       
     def to_dvector
       self

data/split/Dvector/namespace.h

@@ -21,27 +21,35 @@
 #ifndef _NAMESPACE_H
 #define _NAMESPACE_H
 
-/* This header file provides two OS-specific macros for the definition of
-   extern symbols:
+/* This header file provides three OS-specific macros for the definition of
+   extern (or NOT extern) symbols:
 
    * PUBLIC, which has to be used to mark objects that will be used
-   outside the module
+     outside the module
 
-   * PRIVATE, for symbols which are "extern" but intern to the module
+   * INTERN, for symbols which are shared among compilation units within a
+     module, but are NOT exported to other modules.
+
+   * PRIVATE, for symbols which are visible only within the containing
+     compilation unit (i.e. C source file) and, of course, are not exported to
+     other modules.
 
    Please don't add "extern" after the PRIVATE or PUBLIC declaration
    as this would break compilation on Darwin.
 */
 
-#ifdef __APPLE__
+#if __GNUC__ >= 4 /* we have the visibility attribute */
+# define INTERN __attribute__ ((visibility ("hidden")))
+# define PUBLIC __attribute__ ((visibility ("default"))) 
+# define INTERN_EXTERN extern
+#elif defined __APPLE__
 # define INTERN __private_extern__
 # define PUBLIC 
-#elif __GNUC__ >= 4 /* we have the visibility attribute */
-# define INTERN __attribute__ ((visibility ("hidden"))) 
-# define PUBLIC __attribute__ ((visibility ("default"))) 
+# define INTERN_EXTERN
 #else /* not really good */
 # define INTERN
 # define PUBLIC 
+# define INTERN_EXTERN
 #endif /* __APPLE__  and __GNU_C_ >= 4*/
 
 /* In any case, PRIVATE is static */

data/split/Dvector/symbols.h

@@ -22,7 +22,7 @@ PRIVATE void * rb_import_symbol_no_raise(VALUE module,
 		   
 #define DECLARE_SYMBOL(ret_type,name,args) \
   typedef ret_type (*rb_export_##name##_type) args;\
-  INTERN rb_export_##name##_type name
+  INTERN INTERN_EXTERN rb_export_##name##_type name
 
 #define IMPLEMENT_SYMBOL(name)\
   INTERN rb_export_##name##_type name = 0;

data/split/Flate/namespace.h

@@ -21,27 +21,35 @@
 #ifndef _NAMESPACE_H
 #define _NAMESPACE_H
 
-/* This header file provides two OS-specific macros for the definition of
-   extern symbols:
+/* This header file provides three OS-specific macros for the definition of
+   extern (or NOT extern) symbols:
 
    * PUBLIC, which has to be used to mark objects that will be used
-   outside the module
+     outside the module
 
-   * PRIVATE, for symbols which are "extern" but intern to the module
+   * INTERN, for symbols which are shared among compilation units within a
+     module, but are NOT exported to other modules.
+
+   * PRIVATE, for symbols which are visible only within the containing
+     compilation unit (i.e. C source file) and, of course, are not exported to
+     other modules.
 
    Please don't add "extern" after the PRIVATE or PUBLIC declaration
    as this would break compilation on Darwin.
 */
 
-#ifdef __APPLE__
+#if __GNUC__ >= 4 /* we have the visibility attribute */
+# define INTERN __attribute__ ((visibility ("hidden")))
+# define PUBLIC __attribute__ ((visibility ("default"))) 
+# define INTERN_EXTERN extern
+#elif defined __APPLE__
 # define INTERN __private_extern__
 # define PUBLIC 
-#elif __GNUC__ >= 4 /* we have the visibility attribute */
-# define INTERN __attribute__ ((visibility ("hidden"))) 
-# define PUBLIC __attribute__ ((visibility ("default"))) 
+# define INTERN_EXTERN
 #else /* not really good */
 # define INTERN
 # define PUBLIC 
+# define INTERN_EXTERN
 #endif /* __APPLE__  and __GNU_C_ >= 4*/
 
 /* In any case, PRIVATE is static */