tioga 1.9 → 1.11

data/Tioga_README

@@ -1,7 +1,7 @@
-This is the README for the Tioga kernel, version 1.8, April 4, 2008.
+This is the README for the Tioga kernel, version 1.10, March 7, 2009.
 
-    Copyright (C) 2005, 2006, 2007, 2008  Bill Paxton
-    Copyright (C) 2007, 2008 Vincent Fourmond, Taro Sato
+    Copyright (C) 2005, 2006, 2007, 2008, 2009  Bill Paxton
+    Copyright (C) 2007, 2008, 2009 Vincent Fourmond, Taro Sato
     
     This file is part of Tioga.
     
@@ -21,68 +21,44 @@ This is the README for the Tioga kernel, version 1.8, April 4, 2008.
 
 << What's new >>
 
-  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.
+    Version 1.11 brings in a few new features. First, it is now
+possible to set the color of axis tick labels - if you love pink axes,
+you can them fully in Pink, now ;-) ! Check out the
+x/yaxis_labels_color= accessors. The show_axis/axis_info functions
+have been updated accordingly, and are now complete.
 
-  show_plot_without_clipping, obviously a non-clipping version of
-show_plot.
-
-  And all corresponding demonstrations in the samples/ directory !
+    Second, a new interpolation function for monotonic interpolations
+has been added to Dvector (check out the Sampled_pm_cubics sample in
+samples/plots/plots.rb).
 
 
 << Quick Installation of Tioga >>
 
-    Are you feeling lucky?  If so, try QUICK_INSTALL.  This simply does
-the steps for you that are described below.  The install needs to copy some
-files to the ruby directory.  On the Mac, this probably means you need to do
-the whole thing with a 'sudo'.  For Linux, you may have to become root.
-Once you've taken care of that, just run the QUICK_INSTALL script and
-keep your fingers crossed.
+    Are you feeling lucky?  If so, try QUICK_INSTALL.  This simply
+does the steps for you that are described below.  The install needs to
+copy some files to the ruby directory.  On the Mac, this probably
+means you need to do the whole thing with a 'sudo'.  For Linux, you
+may have to become root.  Once you've taken care of that, just run the
+QUICK_INSTALL script and keep your fingers crossed.
 
     You now have the option to run HOME_INSTALL instead, which will
 install the files to your home directory (no root privileges
 needed). You just need to set your RUBYLIB environment variable as
 reminded at the end of the file.
 
-    Please check that there are 0 failures and 0 errors at the end of the test.
-Then, in your favorite PDF previewer, open the newly created 'tests/Icon_Test.pdf'
-and compare it to the prebuilt 'samples/Icon.pdf'.  They should be very similar!
-If it all seems to be working, go directly to the << Documentation >> section below.
+    Please check that there are 0 failures and 0 errors at the end of
+the test.  Then, in your favorite PDF previewer, open the newly
+created 'tests/Icon_Test.pdf' and compare it to the prebuilt
+'samples/Icon.pdf'.  They should be very similar!  If it all seems to
+be working, go directly to the << Documentation >> section below.
 
 
 << Step-by-Step Installation >>
 
-    To get Tioga running, you need to have a working Ruby, a C compiler,
-make, and pdflaxtex.  Assuming you've got all that (more later if you don't),
-connect to the Tioga directory that you just unpacked and do the following:
+    To get Tioga running, you need to have a working Ruby, a C
+compiler, make, and pdflaxtex.  Assuming you've got all that (more
+later if you don't), connect to the Tioga directory that you just
+unpacked and do the following:
 
   [ this has been changed, be careful ! ]
 
@@ -92,29 +68,35 @@ connect to the Tioga directory that you just unpacked and do the following:
     make install
 
 This creates the Makefile, runs it, and finally does the actual
-installation.  The "make install" needs to copy some files to the ruby directory.
-On the Mac, this probably means you need to do the whole thing inside a 'sudo'.
-For Linux, you may have to become root.
+installation.  The "make install" needs to copy some files to the ruby
+directory.  On the Mac, this probably means you need to do the whole
+thing inside a 'sudo'.  For Linux, you may have to become root.
 
-Note that on Linux, the make will compile all the source files.  On the Mac,
-the tar file includes precompiled versions of everything, so the make won't
-have anything to do.  That's okay.  Do the whole sequence anyway just to be safe.
+Note that on Linux, the make will compile all the source files.  On
+the Mac, the tar file includes precompiled versions of everything, so
+the make won't have anything to do.  That's okay.  Do the whole
+sequence anyway just to be safe.
 
     You now have another option to install: if you replace the line
+
     ruby extconf.rb
+
 with 
+
     ruby extconf.rb --home
-it will install the files to your home directory, namely ~/lib/ruby. You don't need root 
-privileges to do that, but make sure that you set RUBYLIB=~/lib/ruby somewhere, so that ruby 
-can find it.
+
+it will install the files to your home directory, namely
+~/lib/ruby. You don't need root privileges to do that, but make sure
+that you set RUBYLIB=~/lib/ruby somewhere, so that ruby can find it.
 
 
 
 
 << Checking The Installation >>
 
-    To make sure at least something works of out the newly installed stuff,
-change directory to your new Tioga folder.  Then enter this to the shell:
+    To make sure at least something works of out the newly installed
+stuff, change directory to your new Tioga folder.  Then enter this to
+the shell:
 
     cd tests
     ruby ts_Tioga.rb
@@ -138,12 +120,14 @@ This should produce something like the following if the install worked:
 
 	55 tests, 647 assertions, 0 failures, 0 errors
 
-[the numbers here are not up-to-date, tests are added everytime a feature is added, so it 
-is likely the numbers you see are greater - it means we're actually working ;-) !]
+[the numbers here are not up-to-date, tests are added everytime a
+feature is added, so it is likely the numbers you see are greater - it
+means we're actually working ;-) !]
 
-These tests ensure that Tioga is accessible and that some of the basic stuff is working.
-Don't skip the visual check of the newly created file 'tests/Icon_Test.pdf'.
-If that's ok, there's a good chance your installation is up and running.
+These tests ensure that Tioga is accessible and that some of the basic
+stuff is working.  Don't skip the visual check of the newly created
+file 'tests/Icon_Test.pdf'.  If that's ok, there's a good chance your
+installation is up and running.
 
 The next step is to do the tutorial found in the documentation.
 
@@ -179,12 +163,12 @@ an email if you'd like a tar file of the images.
 
 << Open Source >>
 
-    You are welcome to take the Tioga source and do what you want with it
-(within the bounds of the GNU license of course).  But don't even think about
-asking for support from me for debugging your new stuff!  I have enough trouble
-with my own bugs to keep me busy endlessly!  But if it looks like a bug in Tioga,
-please do let me know so I can try to fix it.  Or even better, let me know
-the fix along with the bug!
+    You are welcome to take the Tioga source and do what you want with
+it (within the bounds of the GNU license of course).  But don't even
+think about asking for support from me for debugging your new stuff!
+I have enough trouble with my own bugs to keep me busy endlessly!  But
+if it looks like a bug in Tioga, please do let me know so I can try to
+fix it.  Or even better, let me know the fix along with the bug!
 
 
 ----------------------------------
@@ -206,69 +190,121 @@ 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. 
+    Version 1.10 is a minor bug-fix release, the most important one
+being that save_legend_info now draws markers with the proper line
+style.
+
+    In addition, a patch was provided by Benjamin ter Kuile
+<bterkuile@gmail.com> to ease (and quicken) the interpolation of
+non-uniform 3D-data unto a uniform grid. Thanks !
+
+--------------------------
+
+  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 !
+
+--------------------------
+
+    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.7 adds an option in legends for markers without any line;
-just call save_legend_info with 'line_type' => 'None' in addition to
-the marker information.  It is also now possible to give a 'legend' argument
-to show_marker.  The value of the arg can be either a legend dictionary
-or simply the legend text in which case defaults will be supplied for
-the rest.  There is an example of this in samples/plots.rb
-in the Legend_Outside figure.
+    Version 1.7 adds an option in legends for markers without any
+line; just call save_legend_info with 'line_type' => 'None' in
+addition to the marker information.  It is also now possible to give a
+'legend' argument to show_marker.  The value of the arg can be either
+a legend dictionary or simply the legend text in which case defaults
+will be supplied for the rest.  There is an example of this in
+samples/plots.rb in the Legend_Outside figure.
 
     It saw a very significant improvement in that you can now query
-the exact size of a text typeset by LaTeX, with the function text_size. Please
-have a look at its documentation, and at the Text_size and 
-Text_size_with_rotation samples in samples/figures/figures.rb.
+the exact size of a text typeset by LaTeX, with the function
+text_size. Please have a look at its documentation, and at the
+Text_size and Text_size_with_rotation samples in
+samples/figures/figures.rb.
 
-    The code base was quite moved around so as to facilitate work on a 
-Python version that would share as much code as possible with the Ruby one;
-this should not bring user-visible changes (apart, maybe, from compilation
-problems, but we hope not).
+    The code base was quite moved around so as to facilitate work on a
+Python version that would share as much code as possible with the Ruby
+one; this should not bring user-visible changes (apart, maybe, from
+compilation problems, but we hope not).
 
     Some bug fixes, including potential stack overflows (unprotected
-snprintfs), and some new methods of Function. Dvector.fancy_read has been
-reimplemented in C and benchmarked: it should be around three times faster
-than before.
+snprintfs), and some new methods of Function. Dvector.fancy_read has
+been reimplemented in C and benchmarked: it should be around three
+times faster than before.
 
     Code should now compile cleanly with Ruby 1.9.
 
 --------------------------
 
-   Version 1.6 adds numeric label "frequency" and "phase" attributes for
-both axes.  Previously Tioga assumed that every major tick mark got a numeric
-label.  Now the i'th major tick on the axis gets a label only if
-mod(i+j,k)==0 where j is the phase and k is the frequency.  The default
-frequency is naturally 1 so that every major tick gets a label.
-The full names for these attributes are xaxis_numeric_label_frequency,
-xaxis_numeric_label_phase, and similar for yaxis.
+    Version 1.6 adds numeric label "frequency" and "phase" attributes
+for both axes.  Previously Tioga assumed that every major tick mark
+got a numeric label.  Now the i'th major tick on the axis gets a label
+only if mod(i+j,k)==0 where j is the phase and k is the frequency.
+The default frequency is naturally 1 so that every major tick gets a
+label.  The full names for these attributes are
+xaxis_numeric_label_frequency, xaxis_numeric_label_phase, and similar
+for yaxis.
 
 --------------------------
 
-	Version 1.5 is mainly Vincent's work, so my part of this release message
-will be short.  Remember how I killed off the Mac GUI last time?  Turns out there
-was one user who couldn't live without it -- me!  So it's back, but I'm still not
-making any promises about keeping it alive if Apple does something stupid in
-coming releases.  If you're interested in playing with it in spite of that warning,
-it's available from my website (http://theory.kitp.ucsb.edu/~paxton/Tioga-1.5.dmg).
+    Version 1.5 is mainly Vincent's work, so my part of this release
+message will be short.  Remember how I killed off the Mac GUI last
+time?  Turns out there was one user who couldn't live without it --
+me!  So it's back, but I'm still not making any promises about keeping
+it alive if Apple does something stupid in coming releases.  If you're
+interested in playing with it in spite of that warning, it's available
+from my website (http://theory.kitp.ucsb.edu/~paxton/Tioga-1.5.dmg).
 
 	Cheers, Bill
 
-	[Vincent] Version 1.5 has seen a not-so-s�mall change inthe structure of the 
-tutorial, which now has local links to images. So the images are now included in the
-tarball (though the -without-images don't have them, for those who have sparse 
-disk space or bandwidth). To get a local copy of the tutorial, just run rdoc 
-and then link doc/images to images using the following commands:
+    [Vincent] Version 1.5 has seen a not-so-small change inthe
+structure of the tutorial, which now has local links to images. So the
+images are now included in the tarball (though the -without-images
+don't have them, for those who have sparse disk space or
+bandwidth). To get a local copy of the tutorial, just run rdoc and
+then link doc/images to images using the following commands:
 
 cd doc; ln -s ../images .
 
@@ -279,38 +315,46 @@ doesn't run pdflatex (used by ctioga)
   * a Function#derivative method has been added, that does what you think it 
 does.
 
-The C code has been heavily tweaked to prevent segfaults on some 
-architectures/distributions, and some samples were added, notably one for 
-insets (I'll let you find it !).
+The C code has been heavily tweaked to prevent segfaults on some
+architectures/distributions, and some samples were added, notably one
+for insets (I'll let you find it !).
 
 	Cheers, Vincent
 
 --------------------------
 
-	Version 1.4 is a major overhaul with particular emphasis on the tioga user interface.
-Please take a moment to go through the new section of the tutorial titled, CommandLine.
-It gives a detailed discussion of the new tioga command line interface that replaces
-irb_tioga and the old mac gui.  There is a also new small drag-and-drop application for the Mac
-called "Tioga Droplet" that takes any file dropped on it and sends it to the new tioga
-command line interface to have a portfolio created and displayed.  There
-is also a browser-based viewer called Vtioga that JJ Fleck has developed that uses
-command line tioga to create pdfs, converts them to png's, and displays them in a
-browser page using Ruby on Rails.  And Vincent Fourmond has of course been continuing his
-development of Ctioga.  So there are now several nice options available for tioga user
-interfaces.  [BTW: The old mac gui for tioga is now an orphan; I've decided I can't commit to
-giving it the amount of attention it seems to need to stay healthy!  The current upheaval
-in the user interface area is a result of my decision that things needed to get simpler.
-If you've become hopelessly addicted to the old mac gui, I'll happily let you adopt it.
-Just let me know, and it's yours to maintain and develop as long as your sanity lasts.]
-
-	If you take a look in tioga/samples/plots, you will find a new item: plot_styles.rb.
-Do you like to use a sans-serif font for your plots?  Then 'require plot_styles.rb' in your plot file,
-'include MyPlotStyles' in your plot class (the module defined in plot_styles.rb), and call the 'sans_serif_style' method at the beginning of your plot definition 
-(or from your enter_page function, or from your
-plot class initialization method).  Curious about what tioga attributes there are for
-dealing with the appearance of plots?  Scan through the set_default_plot_style method
-in plot_styles.rb.  Want a style that's not in plot_styles.rb?  Great!  Write it yourself,
-and share it with the rest of us by sending a message to tioga-users! 
+    Version 1.4 is a major overhaul with particular emphasis on the
+tioga user interface.  Please take a moment to go through the new
+section of the tutorial titled, CommandLine.  It gives a detailed
+discussion of the new tioga command line interface that replaces
+irb_tioga and the old mac gui.  There is a also new small
+drag-and-drop application for the Mac called "Tioga Droplet" that
+takes any file dropped on it and sends it to the new tioga command
+line interface to have a portfolio created and displayed.  There is
+also a browser-based viewer called Vtioga that JJ Fleck has developed
+that uses command line tioga to create pdfs, converts them to png's,
+and displays them in a browser page using Ruby on Rails.  And Vincent
+Fourmond has of course been continuing his development of Ctioga.  So
+there are now several nice options available for tioga user
+interfaces.  [BTW: The old mac gui for tioga is now an orphan; I've
+decided I can't commit to giving it the amount of attention it seems
+to need to stay healthy!  The current upheaval in the user interface
+area is a result of my decision that things needed to get simpler.  If
+you've become hopelessly addicted to the old mac gui, I'll happily let
+you adopt it.  Just let me know, and it's yours to maintain and
+develop as long as your sanity lasts.]
+
+    If you take a look in tioga/samples/plots, you will find a new
+item: plot_styles.rb.  Do you like to use a sans-serif font for your
+plots?  Then 'require plot_styles.rb' in your plot file, 'include
+MyPlotStyles' in your plot class (the module defined in
+plot_styles.rb), and call the 'sans_serif_style' method at the
+beginning of your plot definition (or from your enter_page function,
+or from your plot class initialization method).  Curious about what
+tioga attributes there are for dealing with the appearance of plots?
+Scan through the set_default_plot_style method in plot_styles.rb.
+Want a style that's not in plot_styles.rb?  Great!  Write it yourself,
+and share it with the rest of us by sending a message to tioga-users!
 
 Additionnally, some more classical functionalities have been added: 
   * show_arrow now allows to specify a 'line_style' and justification for

data/split/Dtable/dtable.c

@@ -1745,6 +1745,72 @@ VALUE dtable_load(VALUE klass, VALUE str)
   return ret;
 }
 
+/* The following function has been written by Benjamin ter Kuile <bterkuile@gmail.com> */
+
+PRIVATE
+/*
+ *  call-seq:
+ *     dtable.interpolate(Xs, Ys, nx, ny, x_start, x_end, y_start, y_end)  -> a_dtable
+ *  
+ *  Returns a copy of _dtable_ with the values interpolated given the proper X and Y axis to create a uniform spaced result in the X- and Y 
+ *  direction consisting of nx- and ny values for each direction.
+ */ VALUE dtable_interpolate(VALUE ary, VALUE x_vec, VALUE y_vec, VALUE nx_val, VALUE ny_val, VALUE xstart_val, VALUE xend_val, VALUE ystart_val, VALUE yend_val)
+{
+   Dtable *d = Get_Dtable(ary);
+	int nx = NUM2DBL(rb_Integer(nx_val));
+	int ny = NUM2DBL(rb_Integer(ny_val));
+   int i, j, num_cols = d->num_cols, num_rows = d->num_rows, last_row = num_rows - 1;
+	
+   long xsrc_len, ysrc_len;
+   double *xsrc = Dvector_Data_for_Read(x_vec, &xsrc_len);
+   double *ysrc = Dvector_Data_for_Read(y_vec, &ysrc_len);
+	if(xsrc_len != num_cols) rb_raise(rb_eArgError, "Number of x values (%d) do not match the number of columns (%d)", xsrc_len, num_cols);
+	if(ysrc_len != num_rows) rb_raise(rb_eArgError, "Number of y values (%d) do not match the number of rows (%d)", ysrc_len, num_rows);
+   VALUE new = dtable_init(dtable_alloc(cDtable), nx, ny);
+   Dtable *d2 = Get_Dtable(new);
+   double **src, **dest;
+	xstart_val = rb_Float(xstart_val);
+	double xstart = NUM2DBL(rb_Float(xstart_val));
+	if(xstart < xsrc[0]) rb_raise(rb_eArgError, "The start x value %g is smaller than the bound (%g)", xstart, xsrc[0]);
+	double xend = NUM2DBL(rb_Float(xend_val));
+	if(xend > xsrc[xsrc_len-1]) rb_raise(rb_eArgError, "The end x value %g is bigger than the bound (%g)", xend, xsrc[xsrc_len-1]);
+	double ystart = NUM2DBL(rb_Float(ystart_val));
+	if(ystart < ysrc[0]) rb_raise(rb_eArgError, "The start y value %g is smaller than the bound (%g)", ystart, ysrc[0]);
+	double yend = NUM2DBL(rb_Float(yend_val));
+	if(yend > ysrc[ysrc_len-1]) rb_raise(rb_eArgError, "The end y value %g is bigger than the bound (%g)", yend, ysrc[ysrc_len-1]);
+	double dx = (xend-xstart)/(nx-1);
+	double dy = (yend-ystart)/(ny-1);
+	double xcurrent = xstart;
+	double ycurrent = ystart;
+	double intvalue;
+	int isrc = 1;
+	int jsrc = 1;
+   src = d->ptr; dest = d2->ptr;
+   for (i = 1; i < ny+1; i++) {
+		while(ysrc[isrc] < ycurrent && ycurrent < ysrc[ysrc_len-1]){
+			isrc++;
+		}
+      for (j = 1; j < nx+1; j++) {
+			while(xsrc[jsrc] < xcurrent && xcurrent < xsrc[xsrc_len-1]){
+				jsrc++;
+			}
+			intvalue = (
+				( src[isrc-1][jsrc-1]*(ysrc[isrc]-ycurrent)*(xsrc[jsrc]-xcurrent)) +
+				( src[isrc][jsrc - 1] * (ycurrent - ysrc[isrc - 1]) * (xsrc[jsrc] - xcurrent) ) +
+				( src[isrc - 1][jsrc] * (ysrc[isrc] - ycurrent) * (xcurrent - xsrc[jsrc - 1]) ) +
+				( src[isrc][jsrc] * (ycurrent - ysrc[isrc - 1]) * (xcurrent - xsrc[jsrc - 1]) )
+			);
+			intvalue = intvalue / ( (ysrc[isrc] - ysrc[isrc - 1]) * (xsrc[jsrc] - xsrc[jsrc - 1]) );
+         dest[i-1][j-1] = intvalue;
+			xcurrent += dx;
+      }
+		xcurrent = xstart;
+		jsrc = 1;
+		ycurrent += dy;
+   }
+   return new;
+}
+
 /* 
  * Document-class: Dobjects::Dtable
  *
@@ -1901,6 +1967,8 @@ PUBLIC void Init_Dtable() {
    rb_define_method(cDtable, "safe_asin!", dtable_safe_asin_bang, 0);
    rb_define_method(cDtable, "safe_acos!", dtable_safe_acos_bang, 0);
 
+   rb_define_method(cDtable, "interpolate", dtable_interpolate, 8);
+
    /* Marshal : */
    rb_define_method(cDtable, "_dump", dtable_dump, 1);
    rb_define_singleton_method(cDtable, "_load", dtable_load, 1);