[Plplot-cvs] SF.net SVN: plplot:[9272] trunk

[<and...@us...>]

Revision: 9272
          http://plplot.svn.sourceforge.net/plplot/?rev=9272&view=rev
Author:   andrewross
Date:     2009-01-07 15:14:56 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
Add example 17 to the standard test suite. Update implementations of 
example 17 so that this works consistently. Tcl and ocaml are currently 
missing an implementation of example 17. For ada the legend labels on 
plstripa are not correctly displayed. 

Modified Paths:
--------------
    trunk/bindings/octave/demos/x17c.m
    trunk/examples/ada/x17a.adb.cmake
    trunk/examples/ada/xthick17a.adb.cmake
    trunk/examples/c/x17c.c
    trunk/examples/c++/x17.cc
    trunk/examples/f77/x17f.fm4
    trunk/examples/f95/x17f.f90
    trunk/examples/java/x17.java
    trunk/examples/perl/x17.pl
    trunk/examples/python/xw17.py
    trunk/plplot_test/test_ada.sh.in
    trunk/plplot_test/test_c.sh.in
    trunk/plplot_test/test_cxx.sh.in
    trunk/plplot_test/test_diff.sh.in
    trunk/plplot_test/test_f77.sh.in
    trunk/plplot_test/test_f95.sh.in
    trunk/plplot_test/test_java.sh.in
    trunk/plplot_test/test_octave.sh.in
    trunk/plplot_test/test_perl.sh.in
    trunk/plplot_test/test_python.sh.in

Modified: trunk/bindings/octave/demos/x17c.m
===================================================================
--- trunk/bindings/octave/demos/x17c.m	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/bindings/octave/demos/x17c.m	2009-01-07 15:14:56 UTC (rev 9272)
@@ -24,17 +24,19 @@
     plsdev("xwin");
   endif
 
+  nsteps = 1000;
+
   ## If db is used the plot is much more smooth. However, because of the
   ## async X behaviour, one does not have a real-time scripcharter.
   ##    plSetOpt("db", ""); 
 
-  plSetOpt("np", "");
+  ## plSetOpt("np", "");
 
   ## Specify some reasonable defaults for ymin and ymax */
   ## The plot will grow automatically if needed (but not shrink) */
 
-  ymin = -1.0;
-  ymax =  1.0;
+  ymin = -0.1;
+  ymax =  0.1;
 
   ## Specify initial tmin and tmax -- this determines length of window. */
   ## Also specify maximum jump in t */
@@ -60,7 +62,7 @@
 
   xlab = 0.; ylab = 0.25;	## legend position 
   
-  autoy = 0;	## autoscale y
+  autoy = 1;	## autoscale y
   acc = 1;	## dont strip, accumulate
 
   ## Initialize plplot */
@@ -73,21 +75,24 @@
 		autoy, acc,
 		colbox, collab,
 		colline', styline', "sum", "sin", "sin*noi", "sin+noi",
-		"t", "pois", "Strip chart demo");
+		"t", "", "Strip chart demo");
 
+  autoy = 0;
+  acc = 1;
+
   ## This is to represent a loop over time */
   ## Let's try a random walk process */
 
   y1 = y2 = y3 = y4 = 0.0;
   dt = 0.1;
 
-  for n = 0:1000
+  for n = 0:nsteps-1
     t = n * dt;
-    noise = randn/2;
+    noise = plrandd()-0.5;
     y1 = y1 + noise;
     y2 = sin(t*pi/18.);
     y3 = y2 * noise;
-    y4 = y2 + noise;
+    y4 = y2 + noise/3.;
     
     ## there is no need for all pens to have the same number of points
     ## or beeing equally time spaced.

Modified: trunk/examples/ada/x17a.adb.cmake
===================================================================
--- trunk/examples/ada/x17a.adb.cmake	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/examples/ada/x17a.adb.cmake	2009-01-07 15:14:56 UTC (rev 9272)
@@ -25,7 +25,6 @@
     Ada.Strings.Unbounded,
     Ada.Numerics,
     Ada.Numerics.Long_Elementary_Functions,
-    Ada.Numerics.Float_Random,
     PLplot_Auxiliary,
     PLplot_Traditional;
 use
@@ -33,7 +32,6 @@
     Ada.Strings.Unbounded,
     Ada.Numerics,
     Ada.Numerics.Long_Elementary_Functions,
-    Ada.Numerics.Float_Random,
     PLplot_Auxiliary,
     PLplot_Traditional;
 
@@ -56,7 +54,6 @@
         To_Unbounded_String("sin"), 
         To_Unbounded_String("sin*noi"), 
         To_Unbounded_String("sin+noi"));
-    Random_Generator : Generator; -- From Ada.Numerics.Float_Random
 begin
     -- plplot initialization
     -- Parse and process command line arguments
@@ -64,8 +61,8 @@
 
     -- If db is used the plot is much more smooth. However, because of the
     -- async X behaviour, one does not have a real-time scripcharter.
-    plsetopt("db", "");
-    plsetopt("np", "");
+    -- plsetopt("db", "");
+    -- plsetopt("np", "");
 
     -- User sets up plot completely except for window and data 
     -- Eventually settings in place when strip chart is created will be
@@ -156,7 +153,7 @@
         -- the delay to 0.02.
         delay 0.01; -- wait a little (10 ms) to simulate time elapsing
         t := Long_Float(n) * dt;
-        noise := Long_Float(Random(Random_Generator)) - 0.5;
+        noise := plrandd - 0.5;
         y1 := y1 + noise;
         y2 := sin(t * pi / 18.0);
         y3 := y2 * noise;
@@ -179,7 +176,7 @@
         if n mod 5 /= 0 then
             plstripa(id1, 3, t, y4);
         end if;
-        pleop;  -- use double buffer (-db on command line)
+        -- pleop;  -- use double buffer (-db on command line)
     end loop;
 
     -- Destroy strip chart and its memory

Modified: trunk/examples/ada/xthick17a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick17a.adb.cmake	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/examples/ada/xthick17a.adb.cmake	2009-01-07 15:14:56 UTC (rev 9272)
@@ -25,7 +25,6 @@
     Ada.Strings.Unbounded,
     Ada.Numerics,
     Ada.Numerics.Long_Elementary_Functions,
-    Ada.Numerics.Float_Random,
     PLplot_Auxiliary,
     PLplot;
 use
@@ -33,7 +32,6 @@
     Ada.Strings.Unbounded,
     Ada.Numerics,
     Ada.Numerics.Long_Elementary_Functions,
-    Ada.Numerics.Float_Random,
     PLplot_Auxiliary,
     PLplot;
 
@@ -56,7 +54,6 @@
         To_Unbounded_String("sin"), 
         To_Unbounded_String("sin*noi"), 
         To_Unbounded_String("sin+noi"));
-    Random_Generator : Generator; -- From Ada.Numerics.Float_Random
 begin
     -- plplot initialization
     -- Parse and process command line arguments
@@ -64,8 +61,8 @@
 
     -- If db is used the plot is much more smooth. However, because of the
     -- async X behaviour, one does not have a real-time scripcharter.
-    Set_Command_Line_Option("db", "");
-    Set_Command_Line_Option("np", "");
+    -- Set_Command_Line_Option("db", "");
+    -- Set_Command_Line_Option("np", "");
 
     -- User sets up plot completely except for window and data 
     -- Eventually settings in place when strip chart is created will be
@@ -156,7 +153,7 @@
         -- the delay to 0.02.
         delay 0.01; -- wait a little (10 ms) to simulate time elapsing
         t := Long_Float(n) * dt;
-        noise := Long_Float(Random(Random_Generator)) - 0.5;
+        noise := Random_Number- 0.5;
         y1 := y1 + noise;
         y2 := sin(t * pi / 18.0);
         y3 := y2 * noise;
@@ -179,7 +176,7 @@
         if n mod 5 /= 0 then
             Update_Stripchart(id1, 3, t, y4);
         end if;
-        Eject_Current_Page;  -- use double buffer (-db on command line)
+        -- Eject_Current_Page;  -- use double buffer (-db on command line)
     end loop;
 
     -- Destroy strip chart and its memory

Modified: trunk/examples/c/x17c.c
===================================================================
--- trunk/examples/c/x17c.c	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/examples/c/x17c.c	2009-01-07 15:14:56 UTC (rev 9272)
@@ -40,9 +40,13 @@
 
 /* If db is used the plot is much more smooth. However, because of the
    async X behaviour, one does not have a real-time scripcharter.
+   This is now disabled since it does not significantly improve the 
+   performance on new machines and makes it difficult to use this
+   example non-interactively since it requires an extra pleop call after
+   each call to plstripa.
 */
-    plsetopt("db", "");
-    plsetopt("np", "");
+    /*plsetopt("db", "");*/
+    /*plsetopt("np", "");*/
 
 /* User sets up plot completely except for window and data 
  * Eventually settings in place when strip chart is created will be
@@ -150,7 +154,9 @@
 	    plstripa(id1, 2, t, y3);
 	if (n%5)
 	    plstripa(id1, 3, t, y4);
-	pleop();  /* use double buffer (-db on command line) */
+
+        /* needed if using double buffering (-db on command line) */
+	/*pleop();*/  
     }
 
 /* Destroy strip chart and it's memory */

Modified: trunk/examples/c++/x17.cc
===================================================================
--- trunk/examples/c++/x17.cc	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/examples/c++/x17.cc	2009-01-07 15:14:56 UTC (rev 9272)
@@ -74,8 +74,8 @@
 
   // If db is used the plot is much more smooth. However, because of the
   // async X behaviour, one does not have a real-time scripcharter.
-  pls->SetOpt("db", "");
-  pls->SetOpt("np", "");
+  //pls->SetOpt("db", "");
+  //pls->SetOpt("np", "");
   // Specify some reasonable defaults for ymin and ymax
   // The plot will grow automatically if needed (but not shrink)
 
@@ -177,7 +177,7 @@
       pls->stripa(id1, 2, t, y3);
     if (n%5)
       pls->stripa(id1, 3, t, y4);
-    pls->eop();  // use double buffer (-db on command line)
+    //pls->eop();  // use double buffer (-db on command line)
   }
 
   // Destroy strip chart and it's memory

Modified: trunk/examples/f77/x17f.fm4
===================================================================
--- trunk/examples/f77/x17f.fm4	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/examples/f77/x17f.fm4	2009-01-07 15:14:56 UTC (rev 9272)
@@ -32,6 +32,9 @@
       integer colbox, collab, colline(4), styline(4)
       character*20 legline(4)
 
+      external plrandd
+      real*8 plrandd
+
       real*8 PI
       parameter ( PI = 3.1415926535897932384d0 )
 
@@ -41,11 +44,6 @@
       integer PL_PARSE_FULL
       parameter(PL_PARSE_FULL = 1)
 
-C      some fortran compilers demand typing of intrinsic rand, and
-C      although this is not demanded on g77 it also works there.
-C      n.b. real*4 will be left alone by double2single.sed script.
-      real*4 rand
-
 C      Process command-line arguments
       call plparseopts(PL_PARSE_FULL)
 
@@ -54,8 +52,8 @@
 C      If db is used the plot is much more smooth. However, because of the
 C      async X behaviour, one does not have a real-time scripcharter.
 C
-      call plsetopt('db', '')
-      call plsetopt('np', '')
+C     call plsetopt('db', '')
+C     call plsetopt('np', '')
 
 C      User sets up plot completely except for window and data
 C      Eventually settings in place when strip chart is created will be
@@ -126,7 +124,7 @@
      &  autoy, acc,
      &  colbox, collab,
      &  colline, styline, legline,
-     &  't', ' ', 'Strip chart demo')
+     &  't', '', 'Strip chart demo')
 
       pl_errcode = .false.
       if ( pl_errcode ) then
@@ -151,11 +149,8 @@
       y3 = 0.0d0
       y4 = 0.0d0
       dt = 0.1d0
-C      start random number generator.
-C      (This use_ of rand should work for g77 and Solaris and ?)
-      noise = rand(1)
 
-      do n = 1,nsteps
+      do n = 0,nsteps-1
 C        wait a little (10 ms) to simulate time elapsing.
 C        g77 sleep has resolution of 1 sec so the call below is commented out
 C        because it is like watching paint dry.  In any case,
@@ -164,8 +159,7 @@
 !        call sleep(1)
 
         t = dble(n) * dt
-C        (This use_ of rand should work for g77 and Solaris and ?)
-        noise = rand(0) - 0.5d0
+        noise = plrandd() - 0.5d0
         y1 = y1 + noise
         y2 = sin(t*PI/18.d0)
         y3 = y2 * noise
@@ -187,7 +181,7 @@
           call plstripa(id1, 3, t, y4)
         endif
 C        use_ double buffer (-db on command line)
-        call pleop()
+C       call pleop()
       enddo
 
 C      Destroy strip chart and it's memory

Modified: trunk/examples/f95/x17f.f90
===================================================================
--- trunk/examples/f95/x17f.f90	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/examples/f95/x17f.f90	2009-01-07 15:14:56 UTC (rev 9272)
@@ -38,11 +38,6 @@
       logical      pl_errcode
       character*80 errmsg
 
-!      some fortran compilers demand typing of intrinsic rand, and
-!      although this is not demanded on g77 it also works there.
-!      n.b. real*4 will be left alone by double2single.sed script.
-      real*4 rand
-
 !      Process command-line arguments
       call plparseopts(PL_PARSE_FULL)
 
@@ -51,8 +46,8 @@
 !      If db is used the plot is much more smooth. However, because of the
 !      async X behaviour, one does not have a real-time scripcharter.
 !
-      call plsetopt('db', '')
-      call plsetopt('np', '')
+!     call plsetopt('db', '')
+!     call plsetopt('np', '')
 
 !      User sets up plot completely except for window and data
 !      Eventually settings in place when strip chart is created will be
@@ -123,7 +118,7 @@
         autoy, acc, &
         colbox, collab, &
         colline, styline, legline, &
-        't', ' ', 'Strip chart demo')
+        't', '', 'Strip chart demo')
 
       pl_errcode = .false.
       if ( pl_errcode ) then
@@ -148,11 +143,8 @@
       y3 = 0.0_plflt
       y4 = 0.0_plflt
       dt = 0.1_plflt
-!      start random number generator.
-!      (This use_ of rand should work for g77 and Solaris and ?)
-      noise = rand(1)
 
-      do n = 1,nsteps
+      do n = 0,nsteps-1
 !        wait a little (10 ms) to simulate time elapsing.
 !        g77 sleep has resolution of 1 sec so the call below is commented out
 !        because it is like watching paint dry.  In any case,
@@ -161,8 +153,7 @@
 !        call sleep(1)
 
         t = dble(n) * dt
-!        (This use_ of rand should work for g77 and Solaris and ?)
-        noise = rand(0) - 0.5_plflt
+        noise = plrandd() - 0.5_plflt
         y1 = y1 + noise
         y2 = sin(t*PI/18._plflt)
         y3 = y2 * noise
@@ -184,7 +175,7 @@
           call plstripa(id1, 3, t, y4)
         endif
 !        use_ double buffer (-db on command line)
-        call pleop()
+!       call pleop()
       enddo
 
 !      Destroy strip chart and it's memory

Modified: trunk/examples/java/x17.java
===================================================================
--- trunk/examples/java/x17.java	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/examples/java/x17.java	2009-01-07 15:14:56 UTC (rev 9272)
@@ -30,8 +30,6 @@
 
 import plplot.core.*;
 
-import java.util.Random;
-
 class x17 {
 
     // Class data
@@ -60,8 +58,8 @@
 
 	// If db is used the plot is much more smooth. However, because of the
 	// async X behaviour, one does not have a real-time scripcharter.
-	pls.setopt("db", "");
-	pls.setopt("np", "");
+	// pls.setopt("db", "");
+	// pls.setopt("np", "");
 	// Specify some reasonable defaults for ymin and ymax
 	// The plot will grow automatically if needed (but not shrink)
 
@@ -135,8 +133,6 @@
 	y1 = y2 = y3 = y4 = 0.0;
 	dt = 0.1;
 
-	Random rnd = new Random();
-	
 	for (n = 0; n < nsteps; n++) {
 	    try {
 		Thread.sleep(10);
@@ -144,7 +140,7 @@
 	    catch (InterruptedException e) {
 	    }
 	    t = (double)n * dt;
-	    noise = rnd.nextDouble() - 0.5;
+	    noise = pls.randd() - 0.5;
 	    y1 = y1 + noise;
 	    y2 = Math.sin(t*Math.PI/18.);
 	    y3 = y2 * noise;
@@ -161,7 +157,7 @@
 		pls.stripa(id1[0], 2, t, y3);
 	    if (n%5 != 0)
 		pls.stripa(id1[0], 3, t, y4);
-	    pls.eop();  // use double buffer (-db on command line)
+	    // pls.eop();  // use double buffer (-db on command line)
 	}
 	
 	// Destroy strip chart and it's memory

Modified: trunk/examples/perl/x17.pl
===================================================================
--- trunk/examples/perl/x17.pl	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/examples/perl/x17.pl	2009-01-07 15:14:56 UTC (rev 9272)
@@ -38,8 +38,8 @@
 # If db is used the plot is much more smooth. However, because of the
 #  async X behaviour, one does not have a real-time scripcharter.
 
-plsetopt ("db", "");
-plsetopt ("np", "");
+# plsetopt ("db", "");
+# plsetopt ("np", "");
 
 # User sets up plot completely except for window and data
 # Eventually settings in place when strip chart is created will be
@@ -123,7 +123,7 @@
 for (my $n = 0; $n < $nsteps; $n++) {
   usleep (10000);    # wait a little (10 ms) to simulate time elapsing
   my $t = $n * $dt;
-  $noise = rand (1.0) - 0.5;
+  $noise = plrandd () - 0.5;
   $y1 = $y1 + $noise;
   $y2 = sin ($t * pi / 18);
   $y3 = $y2 * $noise;
@@ -144,7 +144,7 @@
   if ($n % 5) {
     plstripa ($id1, 3, $t, $y4);
   }
-  pleop ();  # use double buffer (-db on command line)
+#  pleop ();  # use double buffer (-db on command line)
 }
 
 # Destroy strip chart and it's memory

Modified: trunk/examples/python/xw17.py
===================================================================
--- trunk/examples/python/xw17.py	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/examples/python/xw17.py	2009-01-07 15:14:56 UTC (rev 9272)
@@ -38,8 +38,8 @@
 # If db is used the plot is much more smooth. However, because of the
 #   async X behaviour, one does not have a real-time scripcharter.
 
-    plsetopt("db", "")
-    plsetopt("np", "")
+#    plsetopt("db", "")
+#    plsetopt("np", "")
 
 # User sets up plot completely except for window and data 
 # Eventually settings in place when strip chart is created will be

Modified: trunk/plplot_test/test_ada.sh.in
===================================================================
--- trunk/plplot_test/test_ada.sh.in	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/plplot_test/test_ada.sh.in	2009-01-07 15:14:56 UTC (rev 9272)
@@ -31,10 +31,10 @@
 lang="a"
 for index in \
     01 02 03 04 05 06 07 08 09 \
-    10 11 12 13 14 15 16 18 19 20 \
+    10 11 12 13 14 15 16 17 18 19 20 \
     21 22 23 24 25 26 27 28 29 30 31 \
     thick01 thick02 thick03 thick04 thick05 thick06 thick07 thick08 thick09 \
-    thick10 thick11 thick12 thick13 thick14 thick15 thick16 thick18 thick19 thick20 \
+    thick10 thick11 thick12 thick13 thick14 thick15 thick16 thick17 thick18 thick19 thick20 \
     thick21 thick22 thick23 thick24 thick25 thick26 thick27 thick28 thick29 thick30 thick31; do
     if [ "$verbose_test" ] ; then
 	echo "x${index}"

Modified: trunk/plplot_test/test_c.sh.in
===================================================================
--- trunk/plplot_test/test_c.sh.in	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/plplot_test/test_c.sh.in	2009-01-07 15:14:56 UTC (rev 9272)
@@ -27,10 +27,9 @@
 # pushd $cdir; make; popd
 
 # Do the standard non-interactive examples.
-# skip 17 because it is interactive.
 lang="c"
 export index lang
-for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 20 \
+for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 \
     21 22 23 24 25 26 27 28 29 30 31; do
     if [ "$verbose_test" ] ; then
 	echo "x${index}${lang}"

Modified: trunk/plplot_test/test_cxx.sh.in
===================================================================
--- trunk/plplot_test/test_cxx.sh.in	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/plplot_test/test_cxx.sh.in	2009-01-07 15:14:56 UTC (rev 9272)
@@ -36,8 +36,7 @@
 $DEBUG_CMD $cxxdir/x01cc -dev $device -o ${OUTPUT_DIR}/x01cc%n.$dsuffix $options
 
 # Do the standard non-interactive examples.
-# skip 17 because it is interactive.
-for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 31; do
+for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31; do
     if [ "$verbose_test" ] ; then
 	echo "x${index}"
     fi

Modified: trunk/plplot_test/test_diff.sh.in
===================================================================
--- trunk/plplot_test/test_diff.sh.in	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/plplot_test/test_diff.sh.in	2009-01-07 15:14:56 UTC (rev 9272)
@@ -84,8 +84,7 @@
     if [ -f x${xsuffix}01${suffix}.psc ] ; then
 	
   # Standard non-interactive examples
-  # Skip example 17 because it is interactive
-	for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 14a 15 16 18 19 20 \
+	for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 14a 15 16 17 18 19 20 \
 	    21 22 23 24 25 26 27 28 29 30 31 ; do
 	    if [ ! -f x${xsuffix}${index}c.psc ] ; then
 		echo "C example ${index} is missing"

Modified: trunk/plplot_test/test_f77.sh.in
===================================================================
--- trunk/plplot_test/test_f77.sh.in	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/plplot_test/test_f77.sh.in	2009-01-07 15:14:56 UTC (rev 9272)
@@ -54,8 +54,7 @@
     fi
 
 # Do the standard non-interactive examples.
-# skip 17 because it is interactive.
-    for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 31 ; do
+    for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 ; do
 	if [ "$verbose_test" ] ; then
 	    echo "x${index}f"
 	fi
@@ -107,7 +106,7 @@
 
 # Do the standard non-interactive examples.
 # skip 17 because it is interactive.
-  for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 31 ; do
+  for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 ; do
       if [ "$verbose_test" ] ; then
 	  echo "x${index}f"
       fi

Modified: trunk/plplot_test/test_f95.sh.in
===================================================================
--- trunk/plplot_test/test_f95.sh.in	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/plplot_test/test_f95.sh.in	2009-01-07 15:14:56 UTC (rev 9272)
@@ -55,8 +55,7 @@
 
 
 # Do the standard non-interactive examples.
-# skip 17 because it is interactive.
-    for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 31; do
+    for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31; do
 	if [ "$verbose_test" ] ; then
 	    echo "x${index}f"
 	fi
@@ -107,8 +106,7 @@
 
 
 # Do the standard non-interactive examples.
-# skip 17 because it is interactive.
-  for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 31; do
+  for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31; do
       if [ "$verbose_test" ] ; then
 	  echo "x${index}f"
       fi

Modified: trunk/plplot_test/test_java.sh.in
===================================================================
--- trunk/plplot_test/test_java.sh.in	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/plplot_test/test_java.sh.in	2009-01-07 15:14:56 UTC (rev 9272)
@@ -32,7 +32,6 @@
 
 # Do the standard non-interactive examples.
 # skip 19 because it is not implemented.
-# skip 17 because it is interactive.
 #
 # Set up option to point to java bindings jar file and wrapper if needed.
 lang="j"
@@ -46,7 +45,7 @@
     PLPLOT_CLASSPATH=${javadir}:${PLPLOT_CLASSPATH}
 fi
 
-for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 20 21 22 23 24 25 26 27 28 29 30 31 ; do
+for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 20 21 22 23 24 25 26 27 28 29 30 31 ; do
     if [ "$verbose_test" ] ; then
 	echo "x${index}"
     fi

Modified: trunk/plplot_test/test_octave.sh.in
===================================================================
--- trunk/plplot_test/test_octave.sh.in	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/plplot_test/test_octave.sh.in	2009-01-07 15:14:56 UTC (rev 9272)
@@ -71,11 +71,11 @@
 		closefig
 		endfor
 #plot equivalent of x??c examples.  These only required octave-2.0.x
-#For file output 17 is not suitable, and 19 is not done
+#Example 19 is not implemented
 #(and should probably be dropped anyway since the map stuff is not
 #in the API that is supposed to be common to all front ends.)
 		failed = [] ;
-		for i=[1:16 18 20:31 ] ;
+		for i=[1:18 20:31 ] ;
 		ofile = sprintf("${OUTPUT_DIR}/x%.2d${lang}_${dsuffix}.txt",i);
 		strm = fopen(ofile,"w");
 		cmd = sprintf("x%.2dc",i);

Modified: trunk/plplot_test/test_perl.sh.in
===================================================================
--- trunk/plplot_test/test_perl.sh.in	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/plplot_test/test_perl.sh.in	2009-01-07 15:14:56 UTC (rev 9272)
@@ -26,7 +26,6 @@
 # pushd $cdir; make; popd
 
 # Do the standard non-interactive examples.
-# skip 17 because it is interactive.
 
 # Ensure correct version of the libraries are picked up in both the build
 # tree and install tree.
@@ -38,11 +37,11 @@
 fi
 
 if [ "@HAVE_PDL_GRAPHICS_PLPLOT_40@" = "ON" ] ; then
-    INDEX_LIST="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 31"
+    INDEX_LIST="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31"
 else
   # Examples 02, 20, 21, 23, 24, 28, 29, and 30 require PDL::Graphics::PLplot
   # version 0.46 or later.
-    INDEX_LIST="01 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 22 25 26 27"
+    INDEX_LIST="01 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 22 25 26 27"
 fi
 
 for index in $INDEX_LIST ; do

Modified: trunk/plplot_test/test_python.sh.in
===================================================================
--- trunk/plplot_test/test_python.sh.in	2009-01-07 12:13:11 UTC (rev 9271)
+++ trunk/plplot_test/test_python.sh.in	2009-01-07 15:14:56 UTC (rev 9272)
@@ -26,12 +26,11 @@
 # $pythondir must be the build tree and not the source tree (if separate from
 # build tree) since must access plplot_python_start.py in build tree and
 # paths in that file are relative to build tree.
-# Skip 17 because it is interactive and not currently implemented.
 # Skip 19 because it is just a placeholder without a real implementation.
 # Skip 21 if using Numeric - it doesn't work
 # For 24 you need special fonts installed to get good result.
 lang="p"
-for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 \
+for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 \
     20 22 23 24 25 26 27 28 29 30 31 @NUMPY_EXAMPLES@ ; do
     if [ "$verbose_test" ] ; then
 	echo "x${index}"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.