use PDL 2.103 linvals with spec args

Author: mohawk2

Makefile.PL

@@ -20,11 +20,11 @@ WriteMakefile (
   VERSION_FROM => 'lib/PDL/Graphics/TriD.pm',
   CONFIGURE_REQUIRES => {
     'ExtUtils::MakeMaker' => '7.72',
-    'PDL' => '2.096',
+    'PDL' => '2.103',
     'OpenGL::Modern' => '0.0403',
   },
   PREREQ_PM => {
-    'PDL' => '2.096',
+    'PDL' => '2.103', # allaxislinvals, fixed *linvals
     'OpenGL::Modern' => '0.0403',
     'OpenGL::GLFW' => '0.0402',
   },

lib/PDL/Demos/TriD1.pm

@@ -237,7 +237,7 @@ eval { # this is in case no NetPBM, i.e. can't load Earth images
   ($rgb, $rad) = map $rgbrad2->slice($_), '0:2', '3';
   ($w, $h) = map $rgbrad2->dim($_), 1, 2;
   $lonlat = cat(meshgrid(
-    zeroes($w)->xlinvals(-PI,PI), zeroes($h)->xlinvals(-PI/2,PI/2)
+    xlinvals(-PI,PI,$w), xlinvals(-PI/2,PI/2,$h)
   ))->mv(-1,0);
   $lonlatrad = $lonlat->append($rad);
   $sph = t_spherical()->inverse()->apply($lonlatrad);
@@ -267,8 +267,8 @@ $latinds = indx(($lats + 0.5) * $rgbrad->dim(2));
 $loninds = indx((($lons + 1) / 2) * $rgbrad->dim(1));
 $rgbrad3 = $rgbrad->slice(':', map [$_->list], $loninds, $latinds)->sever; # zoom
 $lonlat3 = cat(meshgrid(
-  zeroes($rgbrad3->dim(1))->xlinvals($lons->list),
-  zeroes($rgbrad3->dim(2))->xlinvals($lats->list),
+  xlinvals($lons->list,$rgbrad3->dim(1)),
+  xlinvals($lats->list,$rgbrad3->dim(2)),
 ))->mv(-1,0);
 ($rgb3, $rad3) = map $rgbrad3->slice($_), '0:2', '3';
 $lonlatrad3 = $lonlat3->append($rad3);

lib/PDL/Demos/TriDGallery.pm

@@ -46,7 +46,7 @@ $|.__PACKAGE__.q|::we_opened = !defined $PDL::Graphics::TriD::current_window;
 # B/W Mandelbrot... [Tjl]
 
 use PDL; use PDL::Graphics::TriD; # NOTE all demos need this, only showing once
-$s=150;$x=zeroes $s,$s;$r=$x->xlinvals(-1.5,0.5);$i=$x->ylinvals(-1,1);
+$s=150;$r=xlinvals(-1.5,0.5,$s,$s);$i=ylinvals(-1,1,$s,$s);
 $t=$r;$u=$i;
 for(0..12){$q=$r**2-$i**2+$t;$h=2*$r*$i+$u;($r,$i)=map{$_->clip(-5,5)}($q,$h);}
 imagrgb[($r**2+$i**2)>2.0];
@@ -104,24 +104,24 @@ twiddle3d();
 
 [actnw => q|
 # Torus... (barrel) [Tjl]
-$s=40;$x=zeroes $s,$s;$t=$x->xlinvals(0,6.284);
-$u=$x->ylinvals(0,6.284);$o=5;$i=1;$v=$o+$i*sin$u;
+$s=40;$t=xlinvals(0,6.284,$s,$s);
+$u=ylinvals(0,6.284,$s,$s);$o=5;$i=1;$v=$o+$i*sin$u;
 imag3d([$v*sin$t,$v*cos$t,$i*cos$u]);
 # [press 'q' in the graphics window when done]
 |],
 
 [actnw => q|
 # Ripply torus [Tjl]
-$s=40; $x=zeroes 2*$s,$s/2; $t=$x->xlinvals(0,6.284);
-$u=$x->ylinvals(0,6.284); $o=5; $i=1; $v=$o+$i*sin $u;
+$s=40; $t=xlinvals(0,6.284,2*$s,$s/2);
+$u=ylinvals(0,6.284,2*$s,$s/2); $o=5; $i=1; $v=$o+$i*sin $u;
 imag3d([$v*sin$t,$v*cos$t,$i*cos($u)+$o*sin(3*$t)]);
 # [press 'q' in the graphics window when done]
 |],
 
 [actnw => q|
 # Ripply torus distorted [Tjl]
-$s=40;$x=zeroes 2*$s,$s/2;$t=$x->xlinvals(0,6.284);$u=$x->ylinvals(0,
-6.284); $o=5;$i=1;$v=$o-$o/2*sin(3*$t)+$i*sin$u;
+$s=40;$t=xlinvals(0,6.284,2*$s,$s/2);$u=ylinvals(0, 6.284,2*$s,$s/2);
+$o=5;$i=1;$v=$o-$o/2*sin(3*$t)+$i*sin$u;
 imag3d([$v*sin$t,$v*cos$t,$i*cos($u)+$o*sin(3*$t)]);
 # [press 'q' in the graphics window when done]
 |],

lib/PDL/Graphics/TriD/Contours.pm

@@ -111,8 +111,7 @@ sub new {
       print "ContourInt =  ",$options->{ContourInt},"\n"
                   if $PDL::Graphics::TriD::verbose;
     }
-    $cvals=zeroes(float(), int(($options->{ContourMax}-$options->{ContourMin})/$options->{ContourInt}+1));
-    $cvals = $cvals->xlinvals(@$options{qw(ContourMin ContourMax)});
+    $cvals = xlinvals(float(), @$options{qw(ContourMin ContourMax)}, int(($options->{ContourMax}-$options->{ContourMin})/$options->{ContourInt}+1));
   } else {
     $cvals = $options->{ContourVals};
     @$options{qw(ContourMin ContourMax)} = $cvals->minmax;

lib/PDL/Graphics/TriD/GL.pm

@@ -127,10 +127,9 @@ sub togl_setup {
       $total_chars++;
     }
   }
-  $this->{Impl}{idx} = PDL::cat(@i)->clump(1,2);
-  $this->load_buffer(vert_buf => my $v = PDL::cat(@v)->clump(1,2));
-  $this->load_buffer(texc_buf => my $tc = PDL::cat(@tc)->clump(1,2));
-  $this->load_idx_buffer(indx_buf => $this->{Impl}{idx});
+  $this->load_buffer(vert_buf => PDL::cat(@v)->clump(1,2));
+  $this->load_buffer(texc_buf => PDL::cat(@tc)->clump(1,2));
+  $this->load_idx_buffer(indx_buf => $this->{Impl}{idx} = PDL::cat(@i)->clump(1,2));
   $this->togl_unbind;
 }
 sub gdraw {

lib/PDL/Graphics/TriD/Graph.pm

@@ -144,7 +144,7 @@ sub new {
   $options = $this->{Options};
   my $ndiv = $options->{NDiv};
   my $points = zeroes(PDL::float(),3,3)->append(my $id3 = identity(3));
-  my $starts = zeroes(PDL::float(),1,$ndiv+1)->ylinvals(0,1)->append(zeroes(PDL::float(),2,$ndiv+1));
+  my $starts = ylinvals(PDL::float(),0,1,1,$ndiv+1)->append(zeroes(PDL::float(),2));
   my $ends = $starts + append(0, ones 2) * -0.1;
   my $dupseq = yvals($ndiv+1,3)->flat;
   $_ = $_->dup(1,3)->rotate($dupseq) for $starts, $ends;
@@ -180,7 +180,7 @@ sub finish_scale {
   my ($min_big, $max_big, $shift) = map $_->dice_axis(0, $got_bigdiff), $min, $max, $diff;
   $shift = $shift * 0.05; # don't mutate
   $min_big -= $shift, $max_big += $shift;
-  my $axisvals = zeroes(PDL::float(),3,$this->{NDiv}+1)->ylinvals($this->{Scale}->dog)->t->flat->t;
+  my $axisvals = ylinvals(PDL::float(),$this->{Scale}->dog,3,$this->{NDiv}+1)->t->flat->t;
   $this->{AxisLabelsObj}->set_labels([map sprintf("%.3f", $_), @{ $axisvals->flat->unpdl }]);
 }
 
@@ -293,8 +293,8 @@ sub finish_scale {
   # can be changed to topo heights?
   my $verts = PDL->zeroes(PDL::float(),3,$ns[0],$ns[1]);
   $verts->slice("2") .= 1012.5;
-  $verts->slice("0") .= $verts->slice("0")->ylinvals($nc[0],$nc[0]+$nadd[0]*($ns[0]-1));
-  $verts->slice("1") .= $verts->slice("0")->zlinvals($nc[1],$nc[1]+$nadd[1]*($ns[1]-1));
+  $verts->slice("0")->inplace->ylinvals($nc[0],$nc[0]+$nadd[0]*($ns[0]-1));
+  $verts->slice("1")->inplace->zlinvals($nc[1],$nc[1]+$nadd[1]*($ns[1]-1));
   my $tverts = PDL->zeroes(PDL::float(),3,$ns[0],$ns[1]);
   $tverts = $this->transform($tverts,$verts,[0,1,2]);
   $this->add_object(PDL::Graphics::TriD::Lattice->new($tverts, {Shading=>0}));

lib/PDL/Graphics/TriD/Objects.pm

@@ -270,9 +270,7 @@ sub new {
     my @colordims = $colors->dims;
     PDL::barf "Lattice: colours must be 3,x,y: got (@colordims)" if @colordims != 3 or $colordims[0] != 3;
     PDL::barf "Lattice: colours' x,y must equal points: got colour=(@colordims) points=($x,$y)" if $colordims[1] != $x or $colordims[2] != $y;
-    my $tc = PDL->zeroes(PDL::float, 2, @colordims[1,2]);
-    $tc->slice('(0)') .= $tc->slice('(0)')->xlinvals(0,1); # should be inplace but PDL bugfix not yet released XXX
-    $tc->slice('(1)') .= $tc->slice('(1)')->ylinvals(0,1);
+    my $tc = PDL::allaxislinvals(PDL::float, 0,1, @colordims[1,2]);
     $this->add_object(PDL::Graphics::TriD::Triangles->new($points->clump(1..2), $faceidx, \[$colors, $tc->clump(1..2)], \%less));
   }
   if ($shading == 0 or $options->{Lines}) {