zap zeroes use with rvals, random, etc

Author: mohawk2

demos/DemoTkTriD.pm

@@ -146,7 +146,7 @@ sub linedemos{
   if($demo ne "Off"){
     my $data;
     my $size = 25;
-    my $cz = (xvals zeroes $size+1) / $size;  # interval 0..1
+    my $cz = (xvals $size+1) / $size;  # interval 0..1
     my $cx = 0.5+sin($cz*12.6)/2;	# Corkscrew
     my $cy = 0.5+cos($cz*12.6)/2;
     if($demo eq "B&W"){
@@ -195,8 +195,8 @@ sub Linesdemos{
     my $data;
     my $size = 25;
     my($x,$y,$z);
-    $x = (xvals zeroes $size+1,$size+1) / $size;
-    $y = (yvals zeroes $size+1,$size+1) / $size;
+    $x = (xvals $size+1,$size+1) / $size;
+    $y = (yvals $size+1,$size+1) / $size;
     $z = 0.5 + 0.5 * (sin($x*6.3) * sin($y*6.3)) ** 3; 
     if($demo eq "Lines"){
       $data=PDL::Graphics::TriD::LineStrip->new([$x,$y,$z],[$x,$y,$z]);
@@ -240,8 +240,8 @@ sub Contourdemos{
     my $data;
     my $size = 25;
     my($x,$y,$z);
-    $x = (xvals zeroes $size,$size) / $size;
-    $y = (yvals zeroes $size,$size) / $size;
+    $x = (xvals $size,$size) / $size;
+    $y = (yvals $size,$size) / $size;
     $z = (sin($x*6.3) * sin($y*6.3)) ** 3;
 
     if($demo eq "2DB&W"){

demos/test4.p

@@ -4,10 +4,9 @@ use PDL::Graphics::TriD::Image;
 use PDL::IO::Pic;
 
 $s = 10;
-$k = zeroes($s,$s);
+$k = random($s,$s);
 
-$x = $k->xvals();
-random($k->inplace); $x += $k;
+$x = $k->xvals() + $k;
 
 $y = $k->yvals();
 random($k->inplace); $y += $k;
@@ -25,10 +24,8 @@ $win->clear_objects();
 $win->add_object($pa);
 $win->add_object($pb);
 
-$nx = zeroes(3,20);
-$nc = zeroes(3,20);
-random($nx->inplace);
-random($nc->inplace);
+$nx = random(3,20);
+$nc = random(3,20);
 
 use OpenGL qw(:all);
 glShadeModel (&GL_SMOOTH);

demos/test5.p

@@ -12,8 +12,7 @@ $y /= $size;
 srandom(5);
 random((my $ysl2 = $y->slice("(2)"))->inplace);
 $ysl2 /= 5;
-my $c = PDL->zeroes(3,$size,$size);
-random($c->inplace);
+my $c = PDL->random(3,$size,$size);
 
 my @objs = (
   ['Lattice', {Shading=>0}],

demos/test7.p

@@ -8,8 +8,8 @@ use PDL::Graphics::TriD;
 
 $nx = 20;
 
-$t =  (xvals zeroes $nx+1,$nx+1)/$nx;
-$u =  (yvals zeroes $nx+1,$nx+1)/$nx;
+$t =  (xvals $nx+1,$nx+1)/$nx;
+$u =  (yvals $nx+1,$nx+1)/$nx;
 
 $x = sin($u*15 + $t * 3)/2+0.5 + 5*($t-0.5)**2;
 

demos/tvrml.p

@@ -16,16 +16,13 @@ $set->browser_com('netscape/unix');
 
 $nx = 5;
 
-$t =  (xvals zeroes $nx+1,$nx+1)/$nx;
-$u =  (yvals zeroes $nx+1,$nx+1)/$nx;
+$t =  (xvals $nx+1,$nx+1)/$nx;
+$u =  (yvals $nx+1,$nx+1)/$nx;
 
 $x = sin($u*15 + $t * 3)/2+0.5 + 5*($t-0.5)**2;
-$cx = PDL->zeroes(3,$nx+1,$nx+1);
-random($cx->inplace);
-$pdl = PDL->zeroes(3,20);
-$pdl->inplace->random;
-$cols = PDL->zeroes(3,20);
-$cols->inplace->random;
+$cx = PDL->random(3,$nx+1,$nx+1);
+$pdl = PDL->random(3,20);
+$cols = PDL->random(3,20);
 
 $g = PDL::Graphics::TriD::get_new_graph;
 $name = $g->add_dataseries(PDL::Graphics::TriD::Points->new($pdl,$cols));

demos/tvrml2.p

@@ -22,16 +22,13 @@ $set->browser_com('netscape/unix');
 
 $nx = 20;
 
-$t =  (xvals zeroes $nx+1,$nx+1)/$nx;
-$u =  (yvals zeroes $nx+1,$nx+1)/$nx;
+$t =  (xvals $nx+1,$nx+1)/$nx;
+$u =  (yvals $nx+1,$nx+1)/$nx;
 
 $x = sin($u*15 + $t * 3)/2+0.5 + 5*($t-0.5)**2;
-$cx = PDL->zeroes(3,$nx+1,$nx+1);
-random($cx->inplace);
-$pdl = PDL->zeroes(3,20);
-$pdl->inplace->random;
-$cols = PDL->zeroes(3,20);
-$cols->inplace->random;
+$cx = PDL->random(3,$nx+1,$nx+1);
+$pdl = PDL->random(3,20);
+$cols = PDL->random(3,20);
 
 $g = PDL::Graphics::TriD::get_new_graph;
 $name = $g->add_dataseries(PDL::Graphics::TriD::Points->new($pdl,$cols));

lib/PDL/Demos/TriD1.pm

@@ -72,7 +72,7 @@ my @demo = (
 [actnw => q|
 	# Number of subdivisions for lines / surfaces.
 	$size = 25;
-	$cz = (xvals zeroes $size+1) / $size;  # interval 0..1
+	$cz = (xvals $size+1) / $size;  # interval 0..1
 	$cx = sin($cz*12.6);	# Corkscrew
 	$cy = cos($cz*12.6);
 	line3d [$cx,$cy,$cz];	# Draw a line
@@ -88,8 +88,8 @@ my @demo = (
 |],
 
 [actnw => q|
-	$x = (xvals zeroes $size+1,$size+1) / $size;
-	$y = (yvals zeroes $size+1,$size+1) / $size;
+	$x = (xvals $size+1,$size+1) / $size;
+	$y = (yvals $size+1,$size+1) / $size;
 	$z = 0.5 + 0.5 * (sin($x*6.3) * sin($y*6.3)) ** 3;   # Bumps
 	line3d [$x,$y,$z];	# Draw several lines
 	# [press 'q' in the graphics window when done]
@@ -168,7 +168,7 @@ my @demo = (
 [actnw => q|
 	# The reason for the [] around $x,$y,$z:
 	# 1. You can give all the coordinates and colors in one ndarray.
-	$c = (zeroes 3,$size+1) / $size;
+	$c = zeroes 3,$size+1;
 	$coords =
 		sin((3+3*xvals $c)*yvals $c);
 	$colors = $coords;

lib/PDL/Demos/TriD2.pm

@@ -36,8 +36,8 @@ my @demo = (
 	# Number of subdivisions for lines / surfaces.
 	$size = 25;
 
-	$r = (xvals zeroes $size+1,$size+1) / $size;
-	$g = (yvals zeroes $size+1,$size+1) / $size;
+	$r = (xvals $size+1,$size+1) / $size;
+	$g = (yvals $size+1,$size+1) / $size;
 	$b = ((sin($r*6.3) * sin($g*6.3)) ** 3)/2 + 0.5;   # Bumps
 	imagrgb [$r,$g,$b];	# Draw an image
         # [press 'q' in the graphics window when done]

lib/PDL/Demos/TriDGallery.pm

@@ -161,7 +161,7 @@ points3d[map $_+$_->float->random, whichND(($x!=0)&($x != 255))->transpose->dog]
 |],
 
 # use PDL; use PDL::Image2D; use PDL::Graphics::TriD;nokeeptwiddling3d;
-# $d=byte(random(zeroes(90,90))>0.5);do{$k=byte [[1,1,1],[1,0,1],[1,1,1]];
+# $d=byte(random(90,90)>0.5);do{$k=byte [[1,1,1],[1,0,1],[1,1,1]];
 # imagrgb[$d]if($k++%2); $s=conv2d($d,$k)/8;$i=90*90*random(50);$t=$d->
 # clump(2)-> index($i);$t.=($s->clump(2)->index($i)>.5);}while(!twiddle3d)
 
@@ -202,7 +202,7 @@ keeptwiddling3d(); # restore waiting for user to press 'q'
 [actnw => q~
 # Game of life [Robin Williams (edited by Tjl)]
 use PDL::Image2D;
-$d=byte(random(zeroes(40,40))>0.85); $k=byte [[1,1,1],[1,0,1],[1,1,1]];
+$d=byte(random(40,40)>0.85); $k=byte [[1,1,1],[1,0,1],[1,1,1]];
 nokeeptwiddling3d;
 do {
   imagrgb [$d]; $s=conv2d($d,$k);
@@ -238,7 +238,7 @@ twiddle3d();
 # Dewdney's voters (parallelized) [Tjl, inspired by the above 'life']
 use PDL::Image2D;
 nokeeptwiddling3d;
-$d=byte(random(zeroes(100,100))>0.5); $k=float [[1,1,1],[1,0,1],[1,1,1]];
+$d=byte(random(100,100)>0.5); $k=float [[1,1,1],[1,0,1],[1,1,1]];
 do{
   imagrgb[$d];
   $s=conv2d($d,$k)/8;

lib/PDL/Graphics/TriD.pm

@@ -21,7 +21,7 @@ PDL::Graphics::TriD - PDL 3D interface
 
  # Generate a somewhat interesting sequence of surfaces
  $surf1 = (rvals(100, 100) / 50)**2 + sin(xvals(100, 100) / 10);
- $surf2 = sqrt(rvals(zeroes(50,50))/2);
+ $surf2 = sqrt(rvals(50,50)/2);
  $x = sin($surface); $y = cos($surface), $z = $surface;
  $coords = cat($x, $y, $z)->transpose;
  $red = cos(2*$surface); $green = sin($surface); $blue = $surface;
@@ -214,7 +214,7 @@ This is how, and why, the 3D earth in C<demo 3d> arranges its data.
  line3d $coords;
 
  # Draw a regularly-gridded surface:
- $surface = sqrt(rvals(zeroes(50,50))/2);
+ $surface = sqrt(rvals(50,50)/2);
  print "draw a mesh of a regularly-gridded surface using mesh3d\n";
  mesh3d [$surface];
  print "draw a regularly-gridded surface using imag3d\n";
@@ -274,7 +274,7 @@ Implemented by L<PDL::Graphics::TriD::LineStrip>.
 
 Example:
 
- pdl> line3d [sqrt(rvals(zeroes(50,50))/2)]
+ pdl> line3d [sqrt(rvals(50,50)/2)]
  - Lines on surface
  pdl> line3d [$x,$y,$z]
  - Lines over X, Y, Z
@@ -332,7 +332,7 @@ The variant, C<imag3d_ns>, is implemented by L<PDL::Graphics::TriD::Lattice> def
 
 Example:
 
- pdl> imag3d [sqrt(rvals(zeroes(50,50))/2)], {Lines=>0};
+ pdl> imag3d [sqrt(rvals(50,50)/2)], {Lines=>0};
 
  - Rendered image of surface
 
@@ -356,7 +356,7 @@ Implemented by L<PDL::Graphics::TriD::Lattice>.
 
 Example:
 
- pdl> mesh3d [sqrt(rvals(zeroes(50,50))/2)]
+ pdl> mesh3d [sqrt(rvals(50,50)/2)]
 
  - mesh of surface
 
@@ -408,7 +408,7 @@ Implemented by L<PDL::Graphics::TriD::Points>.
 
 Example:
 
- pdl> points3d [sqrt(rvals(zeroes(50,50))/2)];
+ pdl> points3d [sqrt(rvals(50,50)/2)];
  - points on surface
 
 See module documentation for more information on
@@ -461,7 +461,7 @@ ways one might want to do this.
 
 e.g.
 
- pdl> $x=sqrt(rvals(zeroes(50,50))/2)
+ pdl> $x=sqrt(rvals(50,50)/2)
  pdl> imagrgb [0.5*sin(8*$x)+0.5,0.5*cos(8*$x)+0.5,0.5*cos(4*$x)+0.5]
 
 =head2 imagrgb3d