tioga 1.4 → 1.5

data/split/Flate/namespace.h

@@ -34,14 +34,18 @@
 */
 
 #ifdef __APPLE__
-# define PRIVATE __private_extern__
+# define INTERN __private_extern__
 # define PUBLIC 
 #elif __GNUC__ >= 4 /* we have the visibility attribute */
-# define PRIVATE __attribute__ ((visibility ("hidden"))) 
+# define INTERN __attribute__ ((visibility ("hidden"))) 
 # define PUBLIC __attribute__ ((visibility ("default"))) 
 #else /* not really good */
-# define PRIVATE 
+# define INTERN
 # define PUBLIC 
 #endif /* __APPLE__  and __GNU_C_ >= 4*/
 
+/* In any case, PRIVATE is static */
+
+#define PRIVATE static
+
 #endif

data/split/Flate/symbols.h

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

data/split/Function/extconf.rb

@@ -1,4 +1,4 @@
-# Dtable installation file
+# Function installation file
 require 'mkmf'
 
 create_makefile 'Dobjects/Function'

data/split/Function/function.c

@@ -27,6 +27,7 @@
 #include <ruby.h>
 
 #include "dvector.h"
+#include "../symbols.c"
 
 #include <math.h>
 /* compiler-dependent definitions, such as is_okay_number */
@@ -472,8 +473,8 @@ static VALUE function_make_interpolant(VALUE self)
 						     
 
 /* the function fort joint sorting...*/
-PRIVATE void joint_quicksort(double *const x_values, double * const y_values,
-			     size_t total_elems);
+INTERN void joint_quicksort(double *const x_values, double * const y_values,
+			    size_t total_elems);
 
 /* Dvector's lock */
 #define DVEC_TMPLOCK  FL_USER1
@@ -865,9 +866,10 @@ static VALUE function_integrate(int argc, VALUE *argv, VALUE self)
 }
 
 /*
-   Computes the primitive of the Function and returns it as a new Function.
-   The newly created function shares the X vector with the previous one.
- */
+  Computes the primitive of the Function (whose value for the first point is 0)
+  and returns it as a new Function.
+  The newly created function shares the X vector with the previous one.
+*/
 static VALUE function_primitive(VALUE self)
 {
   long size = function_sanity_check(self);
@@ -886,6 +888,34 @@ static VALUE function_primitive(VALUE self)
   return Function_Create(get_x_vector(self), primitive);
 }
 
+/*
+  Computes the derivative of the Function and returns it as a new Function.
+  The newly created function shares the X vector with the previous one.
+*/
+static VALUE function_derivative(VALUE self)
+{
+  long size = function_sanity_check(self);
+  const double *x = Dvector_Data_for_Read(get_x_vector(self),NULL);
+  const double *y = Dvector_Data_for_Read(get_y_vector(self),NULL);
+  VALUE derivative = Dvector_Create();
+  long i = 0;
+  double val = 0;
+  /* First value */
+  Dvector_Push_Double(derivative, (y[i+1] - y[i]) /(x[i+1] - x[i]));
+  i++;
+  while(i < (size - 1))
+    {
+      Dvector_Push_Double(derivative, 
+			  .5 * (
+				(y[i+1] - y[i]) /(x[i+1] - x[i]) + 
+				(y[i] - y[i-1]) /(x[i] - x[i-1])
+				));
+      i++;
+    }
+  Dvector_Push_Double(derivative, (y[i] - y[i-1]) /(x[i] - x[i-1]));
+  return Function_Create(get_x_vector(self), derivative);
+}
+
 /*
   Returns the number of points inside the function.
 */
@@ -908,7 +938,7 @@ static VALUE function_size(VALUE self)
   - some functions for data access : #x, #y, #point;
   - some utiliy functions: #split_monotonic, #strip_nan;
   - data inspection: #min, #max;
-  - some computationnal functions: #integrate, #primitive.
+  - some computational functions: #integrate, #primitive, #derivative.
 
   And getting bigger everyday...
  */ 
@@ -965,6 +995,8 @@ void Init_Function()
   rb_define_method(cFunction, "integrate", function_integrate, -1);
   /* primitive */
   rb_define_method(cFunction, "primitive", function_primitive, 0);
+  /* derivative */
+  rb_define_method(cFunction, "derivative", function_derivative, 0);
 
   /* distance to a point */
   rb_define_method(cFunction, "distance", function_distance, -1);

data/split/Function/joint_qsort.c

@@ -94,8 +94,7 @@ typedef struct
       smaller partition.  This *guarantees* no more than log (total_elems)
       stack size is needed (actually O(1) in this case)!  */
 
-PRIVATE
-void
+INTERN void
 joint_quicksort (double *const x_values, double * const y_values,
 		 size_t total_elems)
 {

data/split/Function/namespace.h

@@ -34,14 +34,18 @@
 */
 
 #ifdef __APPLE__
-# define PRIVATE __private_extern__
+# define INTERN __private_extern__
 # define PUBLIC 
 #elif __GNUC__ >= 4 /* we have the visibility attribute */
-# define PRIVATE __attribute__ ((visibility ("hidden"))) 
+# define INTERN __attribute__ ((visibility ("hidden"))) 
 # define PUBLIC __attribute__ ((visibility ("default"))) 
 #else /* not really good */
-# define PRIVATE 
+# define INTERN
 # define PUBLIC 
 #endif /* __APPLE__  and __GNU_C_ >= 4*/
 
+/* In any case, PRIVATE is static */
+
+#define PRIVATE static
+
 #endif

data/split/Function/symbols.h

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

data/split/Tioga/axes.c

@@ -294,10 +294,9 @@ char *Get_String(VALUE ary, int index) {
    return StringValuePtr(string);
 }
 
-#define MIN_FLTDIG   3 
 #define MAX_FIXDIG_POS  6
-#define MAX_FIXDIG_NEG  4
-#define DIGMAX_DEF   5
+#define MAX_FIXDIG_NEG  6
+#define DIGMAX_DEF   6
 
 static void Pick_Label_Precision(double vmin, double vmax, double tick, bool use_fixed_pt,
    int *mode, int *prec, int digmax, int *scale) {
@@ -391,7 +390,7 @@ static char **Get_Labels(FM *p, PlotAxis *s)
          ps = NULL;
          if (i == upper_right && !s->log_values && mode && scale)
             sprintf(ps = postfix, 
-                (s->vertical)? " (x\\tiogayaxisnumericlabel{10^{%d}})" : " (x\\tiogaxaxisnumericlabel{10^{%d}})", 
+                (s->vertical)? "$\\times$\\tiogayaxisnumericlabel{10^{%d}}" : "$\\times$\\tiogaxaxisnumericlabel{10^{%d}}", 
                 scale);
          if (i == lower_left && s->nmajors >= 2 && s->vertical && 
                 (s->majors[i] == ((s->reversed)? s->axis_max : s->axis_min)) &&
@@ -557,7 +556,7 @@ static void draw_minor_ticks(FM *p, PlotAxis *s)
    if (s->number_of_minor_intervals <= 0) {
       if (s->log_values) {
          double interval = s->majors[1] - s->majors[0];
-         s->number_of_minor_intervals = (abs(interval) != 1.0 || s->nmajors > 4)? 1 : 9; 
+         s->number_of_minor_intervals = (abs(interval) != 1.0 || s->nmajors > 10)? 1 : 9; 
       }  else s->number_of_minor_intervals = Pick_Number_of_Minor_Intervals(s->interval);
    }
    int i, j, nsub = s->number_of_minor_intervals;

data/split/Tioga/figures.c

@@ -28,6 +28,7 @@
 #include "flate.h"
 
 #include <symbols.h>
+#include "../symbols.c"
 
 #include <stdio.h>
 

data/split/Tioga/figures.h

@@ -46,8 +46,10 @@
 
 // Frame Sides
 
-#define LEFT 0
+#define LEFT -1
+	// LEFT == LEFT_JUSTIFIED
 #define RIGHT 1
+	// RIGHT == RIGHT_JUSTIFIED
 #define TOP 2
 #define BOTTOM 3
 
@@ -84,9 +86,9 @@
     
 // Text and Markers
 
-#define LEFT_JUSTIFIED -1
+#define LEFT_JUSTIFIED LEFT
 #define CENTERED 0
-#define RIGHT_JUSTIFIED 1
+#define RIGHT_JUSTIFIED RIGHT
 
 #define ALIGNED_AT_TOP 0
 #define ALIGNED_AT_MIDHEIGHT 1

data/split/Tioga/lib/Arcs_and_Circles.rb

@@ -11,7 +11,7 @@ class Arcs_and_Circles < Doc < FigureMaker
 #
 # The illustration shows in dark blue the arc that is added for the control points given in red.
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/append_arc.jpg
+# link:images/append_arc.png
 #
    def append_arc_to_path(x_start, y_start, x_corner, y_corner, x_end, y_end, dx, dy)
    end

data/split/Tioga/lib/ColorConstants.rb

@@ -33,13 +33,13 @@ module Tioga
 #
 # - For the protanope, the brightness of red, orange, and yellow is much reduced compared to normal. This dimming can be so pronounced that reds may be confused with black or dark gray, and red traffic lights may appear to be extinguished. They may learn to distinguish reds from yellows and from greens primarily on the basis of their apparent brightness or lightness, not on any perceptible hue difference. Violet, lavender, and purple are indistinguishable from various shades of blue because their reddish components are so dimmed as to be invisible. E.g. Pink flowers, reflecting both red light and blue light, may appear just blue to the protanope.
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/normalcolor72gif.gif
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/protanope72gif.gif
+# link:images/normalcolor72gif.png
+# link:images/protanope72gif.png
 #
 # - The deuteranope suffers the same hue discrimination problems as the protanope, but without the abnormal dimming. The names red, orange, yellow, and green really mean very little to him aside from being different names that every one else around him seems to be able to agree on. Similarly, violet, lavender, purple, and blue, seem to be too many names to use logically for hues that all look alike to him.
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/normalcolor72gif.gif
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/deuteranope72gif.gif
+# link:images/normalcolor72gif.png
+# link:images/deuteranope72gif.png
 #
 # ---
 #
@@ -51,7 +51,7 @@ module Tioga
 # On the right are the same plots as they might appear to someone with protanopia
 # (made using VischeckURL[http://www.vischeck.com/vischeck/vischeckURL.php] -- a very useful site).
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/color_choices.jpg
+# link:images/color_choices.png
 #
 # By using the first set of colors rather than the second, you get a plot that looks good for
 # those in your audience with normal color vision and is much easier on those with a color deficiency.
@@ -61,13 +61,13 @@ module Tioga
 #
 # ---
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/colors1.jpg
+# link:images/colors1.png
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/colors2.jpg
+# link:images/colors2.png
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/colors3.jpg
+# link:images/colors3.png
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/colors4.jpg
+# link:images/colors4.png
 #
 
 module ColorConstants

data/split/Tioga/lib/Creating_Paths.rb

@@ -30,7 +30,7 @@ class Creating_Paths < Doc < FigureMaker
 #
 # The illustration shows in dark blue the curve that is added for the control points given in red.
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/append_curve.jpg
+# link:images/append_curve.png
 #
    def append_curve_to_path(x1, y1, x2, y2, x3, y3)
    end

data/split/Tioga/lib/FigMkr.rb

@@ -33,7 +33,7 @@ class FigureMaker
     
 
     # The tag used for cvs export 
-    CVS_TAG = "rel_1_4"         # now manually cheating...
+    CVS_TAG = "rel_1_5"         # now manually cheating...
     
     # Version now uses the CVS_TAG to create the version number. CVS_TAG should
     # look like 'rel_1_1_0' for the 1.1.0 release. 
@@ -43,7 +43,7 @@ class FigureMaker
       if version.length > 0
         return version
       else
-        return "SNV $Revision: 313 $"    # Can't do better than that.
+        return "SNV $Revision: 348 $"    # Can't do better than that.
       end
     end
 
@@ -1847,6 +1847,29 @@ class FigureMaker
     end
     
     
+
+    # make create_figure_temp_files public for use by applications like ctioga.
+    
+    
+    def create_figure_temp_files(name) # returns true if successful, false if failed.
+        if name.kind_of?(Integer)
+            num = name
+            name = @figure_names[num]
+        else
+            num = @figure_names.index(name)
+        end
+        return false if num == nil
+        cmd = @figure_commands[num]
+        return false unless cmd.kind_of?(Proc)
+        begin
+            reset_legend_info
+            result = private_make(name, cmd)
+            return result
+        rescue Exception => er
+            report_error(er, "ERROR while executing command: #{cmd}")
+        end
+        return false
+    end
     
     
     
@@ -1895,27 +1918,6 @@ class FigureMaker
         end
         return result
     end
-
-    
-    def create_figure_temp_files(name) # returns true if successful, false if failed.
-        if name.kind_of?(Integer)
-            num = name
-            name = @figure_names[num]
-        else
-            num = @figure_names.index(name)
-        end
-        return false if num == nil
-        cmd = @figure_commands[num]
-        return false unless cmd.kind_of?(Proc)
-        begin
-            reset_legend_info
-            result = private_make(name, cmd)
-            return result
-        rescue Exception => er
-            report_error(er, "ERROR while executing command: #{cmd}")
-        end
-        return false
-    end
     
       
     def finish_making_pdfs(fignums,report)

data/split/Tioga/lib/FigureConstants.rb

@@ -45,8 +45,8 @@ module FigureConstants
     ALIGNED_AT_BASELINE = 2
     ALIGNED_AT_BOTTOM = 3
 
-    LEFT = 0
-    RIGHT = 1
+    LEFT = LEFT_JUSTIFIED # LEFT == LEFT_JUSTIFIED so Bill doesn't get confused!
+    RIGHT = RIGHT_JUSTIFIED # similarly, make RIGHT == RIGHT_JUSTIFIED
     TOP = 2
     BOTTOM = 3
 

data/split/Tioga/lib/Figures_and_Plots.rb

@@ -67,7 +67,7 @@ Example
             jpg_image_transparent }
     end
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Subfigures.jpg
+link:images/Subfigures.png
 =end
     def subfigure(margins=nil,&cmd)
     end
@@ -89,7 +89,7 @@ Examples
         t.subplot { t.yaxis_loc = t.ylabel_side = RIGHT; t.no_left_edge; greens }
     end
     
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Two_Ys.jpg
+link:images/Two_Ys.png
 
     def side_by_side
         t.do_box_labels('Side by Side', 'Position', nil)
@@ -101,7 +101,7 @@ http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Two_Ys.jpg
             t.yaxis_loc = t.ylabel_side = RIGHT; t.left_edge_type = AXIS_LINE_ONLY; reds }
     end
     
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Side_by_Side.jpg
+link:images/Side_by_Side.png
 
     def rows
         t.do_box_labels('Blues, Reds, Greens', 'Position', nil)
@@ -122,7 +122,7 @@ http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Side_by_Side.jpg
         end
     end
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Rows.jpg
+link:images/Rows.png
 
     def trio
         t.rescale(0.6)
@@ -133,7 +133,7 @@ http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Rows.jpg
         t.subplot('top_margin' => 0.55) { side_by_side }
     end
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Trio.jpg
+link:images/Trio.png
 =end
     def subplot(margins=nil,&cmd)
     end
@@ -215,7 +215,7 @@ Examples
         end
     end
     
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Legends.jpg
+link:images/Legends.png
 
 =end
     def show_plot_with_legend(dict=nil, &cmd)

data/split/Tioga/lib/Images.rb

@@ -119,7 +119,7 @@ Examples
         2) create_monochrome_image_data for checker board pattern
         3) show_image of Jupiter using the monochrome image data as a stencil_mask 
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Sample_Jpegs.jpg
+link:images/Sample_Jpegs.png
 
 The following is a more lengthy example showing the use of a "false colored" image to
 represent a 2 dimensional table of data.  In this case, the data comes from
@@ -212,7 +212,7 @@ is 'sampled_data' which shows the image in one subplot and the colorbar in anoth
         end
     end
     
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Sampled_Data.jpg
+link:images/Sampled_Data.png
 
 =end
     def show_image(dict)