From 4ab0687cfdd546779ccb6d8589a671441bf5865f Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 7 Apr 2022 03:01:53 +0000 Subject: CTAN sync 202204070301 --- graphics/asymptote/asy.list | 311 ++++++++++++++++++++++---------------------- 1 file changed, 156 insertions(+), 155 deletions(-) (limited to 'graphics/asymptote/asy.list') diff --git a/graphics/asymptote/asy.list b/graphics/asymptote/asy.list index 3b66c33c2e..9a8bf1ca2c 100644 --- a/graphics/asymptote/asy.list +++ b/graphics/asymptote/asy.list @@ -1994,6 +1994,7 @@ pair[][] fft(pair[][] a, int sign=); pair[][][] fft(pair[][][] a, int sign=); pair SE; pen nobasealign; +sCAD operator init(); real animationdelay; animation operator init(); frame NoBox(frame f); @@ -2040,7 +2041,6 @@ bsp operator init(); picture operator cast(face f); face operator cast(path3 p); void add(picture pic=, face[] faces, projection P=); -sCAD operator init(); list_data Set2; list_data YlOrBr; list_data YlGn; @@ -2113,15 +2113,6 @@ list_data Paired; seg_data jet; seg_data summer; list_data RdYlBu; -surface surface(vertex[][] g); -weighted operator init(); -bucket operator init(); -vertex operator init(); -object operator init(); -vertex[][] contour3(triple[][][] v, real[][][] f, real[][][] midpoint=, projection P=); -vertex[][] contour3(real[][][] f, real[][][] midpoint=, triple a, triple b, projection P=); -vertex[][] contour3(real f(real, real, real), triple a, triple b, int nx=, int ny=, int nz=, projection P=); -real eps; segment case1(pair p0, pair p1, int edge); void draw(picture pic=, Label[] L=, guide[][] g, pen[] p); void draw(picture pic=, Label[] L=, guide[][] g, pen p=); @@ -2141,6 +2132,15 @@ guide[][] contour(picture pic=, real f(real, real), pair a, pair b, rea guide[][] contour(picture pic=, real f(pair), pair a, pair b, real[] c, int nx=, int ny=, guide join(... guide[])=); guide[][] contour(picture pic=, pair[] z, real[] f, real[] c, guide join(... guide[])=); real eps; +surface surface(vertex[][] g); +weighted operator init(); +bucket operator init(); +vertex operator init(); +object operator init(); +vertex[][] contour3(triple[][][] v, real[][][] f, real[][][] midpoint=, projection P=); +vertex[][] contour3(real[][][] f, real[][][] midpoint=, triple a, triple b, projection P=); +vertex[][] contour3(real f(real, real, real), triple a, triple b, int nx=, int ny=, int nz=, projection P=); +real eps; void draw(TreeNode root, pair pos); real treeNodeStep; void drawAll(TreeNode node, frame f); @@ -2589,9 +2589,6 @@ circle circle(segment s); circle circle(point A, point B, point C); circle circle(triangle t); circle circle(inversion i); -segment segment(point A, point B); -segment segment(line l); -segment segment(explicit side side); point angpoint(conic co, real angle); point angpoint(explicit circle c, real x); point angpoint(explicit ellipse el, real x, path polarconicroutine(conic co, real angle1, real angle2, int n, bool direction)=); @@ -2808,6 +2805,9 @@ real degrees(vector v, coordsys R=, bool warn=); real degrees(line l, coordsys R=); real degrees(line l1, line l2); real degrees(arc a); +segment segment(point A, point B); +segment segment(line l); +segment segment(explicit side side); real linemargin; real linemargin(); line Oy(coordsys R=); @@ -2914,127 +2914,6 @@ abscissa curabscissa(ellipse el, point M); abscissa curabscissa(parabola p, point M); abscissa curabscissa(conic co, point M); abscissa curabscissa(arc a, point M); -locateT operator init(); -void Straight(flatguide3)(... void(flatguide3)[]); -void graph(flatguide3)(triple F(real), real, real, int)(void join(flatguide3)(... void(flatguide3)[])); -void(flatguide3)[] graph(triple F(real), real, real, int)(void join(flatguide3)(... void(flatguide3)[]), bool3 cond(real)); -void graph(flatguide3)(picture pic=, real x(real), real y(real), real z(real), real a, real b, int n=, void join(flatguide3)(... void(flatguide3)[])=); -void(flatguide3)[] graph(picture pic=, real x(real), real y(real), real z(real), real a, real b, int n=, bool3 cond(real), void join(flatguide3)(... void(flatguide3)[])=); -void graph(flatguide3)(picture pic=, triple v(real), real a, real b, int n=, void join(flatguide3)(... void(flatguide3)[])=); -void(flatguide3)[] graph(picture pic=, triple v(real), real a, real b, int n=, bool3 cond(real), void join(flatguide3)(... void(flatguide3)[])=); -void graph(flatguide3)(picture pic=, triple[] v, void join(flatguide3)(... void(flatguide3)[])=); -void(flatguide3)[] graph(picture pic=, triple[] v, bool3[] cond, void join(flatguide3)(... void(flatguide3)[])=); -void graph(flatguide3)(picture pic=, real[] x, real[] y, real[] z, void join(flatguide3)(... void(flatguide3)[])=); -void(flatguide3)[] graph(picture pic=, real[] x, real[] y, real[] z, bool3[] cond, void join(flatguide3)(... void(flatguide3)[])=); -void graph(flatguide3)(triple F(path, real), path p, int n=, void join(flatguide3)(... void(flatguide3)[])=); -void graph(flatguide3)(triple F(pair), path p, int n=, void join(flatguide3)(... void(flatguide3)[])=); -void graph(flatguide3)(picture pic=, real f(pair), path p, int n=, void join(flatguide3)(... void(flatguide3)[])=); -void graph(flatguide3)(real f(pair), path p, int n=, real T(pair), void join(flatguide3)(... void(flatguide3)[])=); -void(flatguide3)[][] lift(real f(real x, real y), guide[][] g, void join(flatguide3)(... void(flatguide3)[])=); -void(flatguide3)[][] lift(real f(pair z), guide[][] g, void join(flatguide3)(... void(flatguide3)[])=); -triple polar(real r, real theta, real phi); -void polargraph(flatguide3)(real r(real, real), real theta(real), real phi(real), int n=, void join(flatguide3)(... void(flatguide3)[])=); -bool uperiodic(real[][] a); -bool uperiodic(triple[][] a); -bool vperiodic(real[][] a); -bool vperiodic(triple[][] a); -void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(Label format=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, int N=, int n=, real Step=, real step=, bool begin=, bool end=, tickvalues modify(tickvalues)=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); -void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(Label format=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, real[] Ticks, real[] ticks=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); -void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=); -void axis(picture pic=, Label L=, path3 g, path3 g2=, pen p=, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=), ticklocate locate, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=, int[] divisor=, bool above=, bool opposite=); -void Bounds(picture, axisT)(int type=, int type2=, triple align=, bool extend=); -void Bounds(picture, axisT); -void xaxis3At(picture pic=, Label L=, void axis(picture, axisT), real xmin=, real xmax=, pen p=, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)=, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=, bool above=, bool opposite=, bool opposite2=, bool primary=); -void yaxis3At(picture pic=, Label L=, void axis(picture, axisT), real ymin=, real ymax=, pen p=, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)=, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=, bool above=, bool opposite=, bool opposite2=, bool primary=); -void zaxis3At(picture pic=, Label L=, void axis(picture, axisT), real zmin=, real zmax=, pen p=, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)=, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=, bool above=, bool opposite=, bool opposite2=, bool primary=); -void xaxis3(picture pic=, Label L=, void axis(picture, axisT)=, real xmin=, real xmax=, pen p=, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)=, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=, bool above=); -void yaxis3(picture pic=, Label L=, void axis(picture, axisT)=, real ymin=, real ymax=, pen p=, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)=, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=, bool above=); -void zaxis3(picture pic=, Label L=, void axis(picture, axisT)=, real zmin=, real zmax=, pen p=, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)=, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=, bool above=); -void XZZero(picture, axisT)(triple align=, bool extend=); -void XZZero(picture, axisT); -void YZZero(picture, axisT)(triple align=, bool extend=); -void YZZero(picture, axisT); -surface surface(picture pic=, triple[][] f, bool[][] cond=); -surface surface(picture pic=, real[][] f, real[] x, real[] y, real[] xsplinetype(real[], real[])=, real[] ysplinetype(real[], real[])=, bool[][] cond=); -surface surface(picture pic=, real[][] f, pair a, pair b, real[] xsplinetype(real[], real[]), real[] ysplinetype(real[], real[])=, bool[][] cond=); -surface surface(picture pic=, real[][] f, pair a, pair b, bool[][] cond=); -surface surface(picture pic=, triple f(pair z), pair a, pair b, int nu=, int nv=, bool cond(pair z)=); -surface surface(picture pic=, triple f(pair z), real[] u, real[] v, real[](real[], real[])[] usplinetype, real[](real[], real[])[] vsplinetype=, bool cond(pair z)=); -surface surface(picture pic=, triple f(pair z), pair a, pair b, int nu=, int nv=, real[](real[], real[])[] usplinetype, real[](real[], real[])[] vsplinetype=, bool cond(pair z)=); -surface surface(picture pic=, real f(pair z), pair a, pair b, int nx=, int ny=, bool cond(pair z)=); -surface surface(picture pic=, real f(pair z), pair a, pair b, int nx=, int ny=, real[] xsplinetype(real[], real[]), real[] ysplinetype(real[], real[])=, bool cond(pair z)=); -void XYEquals(picture, axisT)(real x, real y, triple align=, bool extend=); -triple Dir(real)(triple dir); -void draw(picture pic=, Label[] L=, void(flatguide3)[][] g, pen[] p, light light=, string name=, render render=, interaction interaction=); -void draw(picture pic=, Label[] L=, void(flatguide3)[][] g, pen p=, light light=, string name=, render render=, interaction interaction=); -void Ticks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(int sign, Label F=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, real[] Ticks=, real[] ticks=, int N=, bool begin=, bool end=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); -void Ticks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(int sign, Label F=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, int N, int n=, real Step=, real step=, bool begin=, bool end=, tickvalues modify(tickvalues)=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); -real maxlength(triple f(pair z), pair a, pair b, int nu, int nv); -void drawtick(picture pic, real[][] T, path3 g, path3 g2, ticklocate locate, real val, real Size, int sign, pen p, bool extend); -triple tickMin3(picture pic); -triple tickMax3(picture pic); -triple Scale(picture pic=, triple v); -triple[][] Scale(picture pic=, triple[][] P); -real ScaleX(picture pic=, real x); -real ScaleY(picture pic=, real y); -real ScaleZ(picture pic=, real z); -real[][] ScaleZ(picture pic=, real[][] P); -picture vectorfield(path3 vector(pair v), triple f(pair z), pair a, pair b, int nu=, int nv=, bool truesize=, real maxlength=, bool cond(pair z)=, pen p=, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=, string name=, render render=); -path3 Circle(triple c, real r, triple normal=, int n=); -void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(Label format=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, int N=, int n=, real Step=, real step=, bool begin=, bool end=, tickvalues modify(tickvalues)=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); -void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(Label format=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, real[] Ticks, real[] ticks=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); -void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=); -void Spline(flatguide3)(... void(flatguide3)[]); -void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(Label format=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, int N=, int n=, real Step=, real step=, bool begin=, bool end=, tickvalues modify(tickvalues)=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); -void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(Label format=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, real[] Ticks, real[] ticks=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); -void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=); -void axes3(picture pic=, Label xlabel=, Label ylabel=, Label zlabel=, bool extend=, triple min=, triple max=, pen p=, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=); -void label(picture pic, Label L, triple v, real x, align align, string format, pen p); -void labelx(picture pic=, Label L=, triple v, align align=, string format=, pen p=); -void labelx3(picture pic=, Label L=, real x, align align=, string format=, pen p=); -void labeltick(picture pic, real[][] T, path3 g, ticklocate locate, real val, int sign, real Size, string ticklabel(real), Label F, real norm=); -void labelaxis(picture pic, real[][] T, Label L, path3 g, ticklocate locate=, int sign=, bool ticklabels=); -void labely(picture pic=, Label L=, triple v, align align=, string format=, pen p=); -void labely3(picture pic=, Label L=, real y, align align=, string format=, pen p=); -void labelz(picture pic=, Label L=, triple v, align align=, string format=, pen p=); -void labelz3(picture pic=, Label L=, real z, align align=, string format=, pen p=); -void autoscale3(picture pic=, void axis(picture, axisT)); -void xtick(picture pic=, triple v, triple dir=, real size=, pen p=); -void xtick(picture pic=, Label L, triple v, triple dir=, string format=, real size=, pen p=); -void xtick3(picture pic=, real x, triple dir=, real size=, pen p=); -void xtick3(picture pic=, Label L, real x, triple dir=, string format=, real size=, pen p=); -void ytick(picture pic=, triple v, triple dir=, real size=, pen p=); -void ytick(picture pic=, Label L, triple v, triple dir=, string format=, real size=, pen p=); -void ytick3(picture pic=, real y, triple dir=, real size=, pen p=); -void ytick3(picture pic=, Label L, real y, triple dir=, string format=, real size=, pen p=); -void ztick(picture pic=, triple v, triple dir=, real size=, pen p=); -void ztick(picture pic=, Label L, triple v, triple dir=, string format=, real size=, pen p=); -void ztick3(picture pic=, real z, triple dir=, real size=, pen p=); -void ztick3(picture pic=, Label L, real z, triple dir=, string format=, real size=, pen p=); -triple defaultdir(triple X, triple Y, triple Z, bool opposite=, projection P); -real xtrans(real[][] t, real x); -real ytrans(real[][] t, real y); -real ztrans(real[][] t, real z); -ticklocate ticklocate(real a, real b, autoscaleT S=, real tickmin=, real tickmax=, real time(real)=, triple dir(real)); -triple ticklabelshift(triple align, pen p=); -path3 Arc(triple c, triple v1, triple v2, triple normal=, bool direction=, int n=); -path3 Arc(triple c, real r, real theta1, real phi1, real theta2, real phi2, triple normal=, bool direction, int n=); -path3 Arc(triple c, real r, real theta1, real phi1, real theta2, real phi2, triple normal=, int n=); -void limits(picture pic=, triple min, triple max); -void XZEquals(picture, axisT)(real x, real z, triple align=, bool extend=); -void YZEquals(picture, axisT)(real y, real z, triple align=, bool extend=); -void XYZero(picture, axisT)(triple align=, bool extend=); -void XYZero(picture, axisT); -void zlimits(picture pic=, real min=, real max=, bool crop=); -void tick(picture pic=, triple v, triple dir, real size=, pen p=); -void tick(picture pic=, Label L, real value, triple v, triple dir, string format=, real size=, pen p=); -surface bispline(real[][] z, real[][] p, real[][] q, real[][] r, real[] x, real[] y, bool[][] cond=); -real[][][] bispline(real[][] f, real[] x, real[] y, real[] xsplinetype(real[], real[])=, real[] ysplinetype(real[], real[])=, bool[][] cond=); -real[][][] bispline0(real[][] z, real[][] p, real[][] q, real[][] r, real[] x, real[] y, bool[][] cond=); -path3[] segment(triple[] v, bool[] cond, void join(flatguide3)(... void(flatguide3)[])=); -real[] uniform(real T(real x), real Tinv(real x), real a, real b, int n); -void NoTicks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(); -void NoTicks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=); string DefaultFormat(real); string DefaultLogFormat(real)(int base); string DefaultLogFormat(real); @@ -3087,11 +2966,11 @@ void labelx(picture pic=, Label L, string format=, explicit pe path Arc(pair c, real r, real angle1, real angle2, bool direction, int n=); path Arc(pair c, real r, real angle1, real angle2, int n=); path Arc(pair c, explicit pair z1, explicit pair z2, bool direction=, int n=); -pair labeltick(frame d, transform T, path g, ticklocate locate, real val, pair side, int sign, real Size, string ticklabel(real), Label F, real norm=); -void labelaxis(frame f, transform T, Label L, path g, ticklocate locate=, int sign=, bool ticklabels=); void labely(picture pic=, Label L=, explicit pair z, align align=, string format=, pen p=); void labely(picture pic=, Label L=, real y, align align=, string format=, pen p=); void labely(picture pic=, Label L, string format=, explicit pen p=); +pair labeltick(frame d, transform T, path g, ticklocate locate, real val, pair side, int sign, real Size, string ticklabel(real), Label F, real norm=); +void labelaxis(frame f, transform T, Label L, path g, ticklocate locate=, int sign=, bool ticklabels=); void xtick(picture pic=, explicit pair z, pair dir=, real size=, pen p=); void xtick(picture pic=, real x, pair dir=, real size=, pen p=); void xtick(picture pic=, Label L, explicit pair z, pair dir=, string format=, real size=, pen p=); @@ -3102,16 +2981,16 @@ void ytick(picture pic=, Label L, explicit pair z, pair dir=, void ytick(picture pic=, Label L, real y, pair dir=, string format=, real size=, pen p=); picture secondaryX(picture primary=, void f(picture)); picture secondaryY(picture primary=, void f(picture)); +tickvalues OmitTickIntervals(tickvalues)(real[] a, real[] b); +tickvalues OmitTickInterval(tickvalues)(real a, real b); +tickvalues OmitTick(tickvalues)(... real[] x); Label Break; tickvalues Break(tickvalues)(real, real); scaleT Linear; scaleT Linear(bool automin=, bool automax=, real s=, real intercept=); pair tickMin(picture pic); pair tickMax(picture pic); -tickvalues OmitTickIntervals(tickvalues)(real[] a, real[] b); string autoformat(string format=, real norm ... real[] a); -tickvalues OmitTickInterval(tickvalues)(real a, real b); -tickvalues OmitTick(tickvalues)(... real[] x); real linear(real)(real S(real x)=, real Min, real Max); pair polar(real r, real theta); string Format(real)(string s=); @@ -3120,6 +2999,8 @@ guide polargraph(picture pic=, real[] r, real[] theta, guide join(... g void LeftTicks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=)(Label format=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, int N=, int n=, real Step=, real step=, bool begin=, bool end=, tickvalues modify(tickvalues)=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); void LeftTicks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=)(Label format=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, real[] Ticks, real[] ticks=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); void LeftTicks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=); +tickvalues NoZero(tickvalues); +string NoZeroFormat(real); guide Hermite(... guide[])(real[] splinetype(real[], real[])); guide Hermite(... guide[]); path Circle(pair c, real r, int n=); @@ -3137,14 +3018,16 @@ void yequals(picture pic=, Label L=, real y, bool extend=, pair z); real ScaleX(picture pic=, real x); real ScaleY(picture pic=, real y); +void xaxisAt(picture pic=, Label L=, void axis(picture, axisT), real xmin=, real xmax=, pen p=, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=)=, bool arrow(picture, path, pen, marginT(path, pen))=, marginT margin(path, pen)=, bool above=, bool opposite=); tickvalues generateticks(int sign, Label F=, string ticklabel(real)=, int N, int n=, real Step=, real step=, real Size=, real size=, transform T, pair side, path g, real limit, pen p, ticklocate locate, int[] divisor, bool opposite); -path[] segment(pair[] z, bool[] cond, guide join(... guide[])=); +void yaxisAt(picture pic=, Label L=, void axis(picture, axisT), real ymin=, real ymax=, pen p=, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=)=, bool arrow(picture, path, pen, marginT(path, pen))=, marginT margin(path, pen)=, bool above=, bool opposite=); +void xaxis(picture pic=, Label L=, void axis(picture, axisT)=, real xmin=, real xmax=, pen p=, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=)=, bool arrow(picture, path, pen, marginT(path, pen))=, marginT margin(path, pen)=, bool above=); +void yaxis(picture pic=, Label L=, void axis(picture, axisT)=, real ymin=, real ymax=, pen p=, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=)=, bool arrow(picture, path, pen, marginT(path, pen))=, marginT margin(path, pen)=, bool above=, bool autorotate=); void checkconditionlength(int x, int y); real xtrans(transform t, real x); void Top(picture, axisT)(bool extend=); void Top(picture, axisT); real ytrans(transform t, real y); -string NoZeroFormat(real); void scale(picture pic=, scaleT x, scaleT y=, scaleT z=); void scale(picture pic=, bool xautoscale=, bool yautoscale=, bool zautoscale=); int[] divisors(int a, int b); @@ -3154,14 +3037,10 @@ ticklocate operator init(); locateT operator init(); tickvalues operator init(); axisT operator init(); -tickvalues NoZero(tickvalues); int Both; void axes(picture pic=, Label xlabel=, Label ylabel=, bool extend=, pair min=, pair max=, pen p=, bool arrow(picture, path, pen, marginT(path, pen))=, marginT margin(path, pen)=, bool above=); string signedtrailingzero; -void xaxisAt(picture pic=, Label L=, void axis(picture, axisT), real xmin=, real xmax=, pen p=, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=)=, bool arrow(picture, path, pen, marginT(path, pen))=, marginT margin(path, pen)=, bool above=, bool opposite=); -void yaxisAt(picture pic=, Label L=, void axis(picture, axisT), real ymin=, real ymax=, pen p=, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=)=, bool arrow(picture, path, pen, marginT(path, pen))=, marginT margin(path, pen)=, bool above=, bool opposite=); -void xaxis(picture pic=, Label L=, void axis(picture, axisT)=, real xmin=, real xmax=, pen p=, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=)=, bool arrow(picture, path, pen, marginT(path, pen))=, marginT margin(path, pen)=, bool above=); -void yaxis(picture pic=, Label L=, void axis(picture, axisT)=, real ymin=, real ymax=, pen p=, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=)=, bool arrow(picture, path, pen, marginT(path, pen))=, marginT margin(path, pen)=, bool above=, bool autorotate=); +path[] segment(pair[] z, bool[] cond, guide join(... guide[])=); ticklocate ticklocate(real a, real b, autoscaleT S=, real tickmin=, real tickmax=, real time(real)=, pair dir(real)=); pair ticklabelshift(pair align, pen p=); pair zero(real); @@ -3195,6 +3074,127 @@ void autoscale(picture pic=, void axis(picture, axisT)); guide Spline(... guide[]); void LeftRight(picture, axisT)(bool extend=); void LeftRight(picture, axisT); +path3[] segment(triple[] v, bool[] cond, void join(flatguide3)(... void(flatguide3)[])=); +locateT operator init(); +void Straight(flatguide3)(... void(flatguide3)[]); +void graph(flatguide3)(triple F(real), real, real, int)(void join(flatguide3)(... void(flatguide3)[])); +void(flatguide3)[] graph(triple F(real), real, real, int)(void join(flatguide3)(... void(flatguide3)[]), bool3 cond(real)); +void graph(flatguide3)(picture pic=, real x(real), real y(real), real z(real), real a, real b, int n=, void join(flatguide3)(... void(flatguide3)[])=); +void(flatguide3)[] graph(picture pic=, real x(real), real y(real), real z(real), real a, real b, int n=, bool3 cond(real), void join(flatguide3)(... void(flatguide3)[])=); +void graph(flatguide3)(picture pic=, triple v(real), real a, real b, int n=, void join(flatguide3)(... void(flatguide3)[])=); +void(flatguide3)[] graph(picture pic=, triple v(real), real a, real b, int n=, bool3 cond(real), void join(flatguide3)(... void(flatguide3)[])=); +void graph(flatguide3)(picture pic=, triple[] v, void join(flatguide3)(... void(flatguide3)[])=); +void(flatguide3)[] graph(picture pic=, triple[] v, bool3[] cond, void join(flatguide3)(... void(flatguide3)[])=); +void graph(flatguide3)(picture pic=, real[] x, real[] y, real[] z, void join(flatguide3)(... void(flatguide3)[])=); +void(flatguide3)[] graph(picture pic=, real[] x, real[] y, real[] z, bool3[] cond, void join(flatguide3)(... void(flatguide3)[])=); +void graph(flatguide3)(triple F(path, real), path p, int n=, void join(flatguide3)(... void(flatguide3)[])=); +void graph(flatguide3)(triple F(pair), path p, int n=, void join(flatguide3)(... void(flatguide3)[])=); +void graph(flatguide3)(picture pic=, real f(pair), path p, int n=, void join(flatguide3)(... void(flatguide3)[])=); +void graph(flatguide3)(real f(pair), path p, int n=, real T(pair), void join(flatguide3)(... void(flatguide3)[])=); +void(flatguide3)[][] lift(real f(real x, real y), guide[][] g, void join(flatguide3)(... void(flatguide3)[])=); +void(flatguide3)[][] lift(real f(pair z), guide[][] g, void join(flatguide3)(... void(flatguide3)[])=); +triple polar(real r, real theta, real phi); +void polargraph(flatguide3)(real r(real, real), real theta(real), real phi(real), int n=, void join(flatguide3)(... void(flatguide3)[])=); +bool uperiodic(real[][] a); +bool uperiodic(triple[][] a); +bool vperiodic(real[][] a); +bool vperiodic(triple[][] a); +void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(Label format=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, int N=, int n=, real Step=, real step=, bool begin=, bool end=, tickvalues modify(tickvalues)=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); +void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(Label format=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, real[] Ticks, real[] ticks=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); +void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=); +void axis(picture pic=, Label L=, path3 g, path3 g2=, pen p=, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=), ticklocate locate, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=, int[] divisor=, bool above=, bool opposite=); +void Bounds(picture, axisT)(int type=, int type2=, triple align=, bool extend=); +void Bounds(picture, axisT); +void XZZero(picture, axisT)(triple align=, bool extend=); +void XZZero(picture, axisT); +void YZZero(picture, axisT)(triple align=, bool extend=); +void YZZero(picture, axisT); +void xaxis3At(picture pic=, Label L=, void axis(picture, axisT), real xmin=, real xmax=, pen p=, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)=, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=, bool above=, bool opposite=, bool opposite2=, bool primary=); +void yaxis3At(picture pic=, Label L=, void axis(picture, axisT), real ymin=, real ymax=, pen p=, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)=, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=, bool above=, bool opposite=, bool opposite2=, bool primary=); +void zaxis3At(picture pic=, Label L=, void axis(picture, axisT), real zmin=, real zmax=, pen p=, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)=, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=, bool above=, bool opposite=, bool opposite2=, bool primary=); +void xaxis3(picture pic=, Label L=, void axis(picture, axisT)=, real xmin=, real xmax=, pen p=, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)=, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=, bool above=); +void yaxis3(picture pic=, Label L=, void axis(picture, axisT)=, real ymin=, real ymax=, pen p=, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)=, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=, bool above=); +void zaxis3(picture pic=, Label L=, void axis(picture, axisT)=, real zmin=, real zmax=, pen p=, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)=, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=, bool above=); +surface surface(picture pic=, triple[][] f, bool[][] cond=); +surface surface(picture pic=, real[][] f, real[] x, real[] y, real[] xsplinetype(real[], real[])=, real[] ysplinetype(real[], real[])=, bool[][] cond=); +surface surface(picture pic=, real[][] f, pair a, pair b, real[] xsplinetype(real[], real[]), real[] ysplinetype(real[], real[])=, bool[][] cond=); +surface surface(picture pic=, real[][] f, pair a, pair b, bool[][] cond=); +surface surface(picture pic=, triple f(pair z), pair a, pair b, int nu=, int nv=, bool cond(pair z)=); +surface surface(picture pic=, triple f(pair z), real[] u, real[] v, real[](real[], real[])[] usplinetype, real[](real[], real[])[] vsplinetype=, bool cond(pair z)=); +surface surface(picture pic=, triple f(pair z), pair a, pair b, int nu=, int nv=, real[](real[], real[])[] usplinetype, real[](real[], real[])[] vsplinetype=, bool cond(pair z)=); +surface surface(picture pic=, real f(pair z), pair a, pair b, int nx=, int ny=, bool cond(pair z)=); +surface surface(picture pic=, real f(pair z), pair a, pair b, int nx=, int ny=, real[] xsplinetype(real[], real[]), real[] ysplinetype(real[], real[])=, bool cond(pair z)=); +void XYEquals(picture, axisT)(real x, real y, triple align=, bool extend=); +triple Dir(real)(triple dir); +void draw(picture pic=, Label[] L=, void(flatguide3)[][] g, pen[] p, light light=, string name=, render render=, interaction interaction=); +void draw(picture pic=, Label[] L=, void(flatguide3)[][] g, pen p=, light light=, string name=, render render=, interaction interaction=); +void Ticks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(int sign, Label F=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, real[] Ticks=, real[] ticks=, int N=, bool begin=, bool end=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); +void Ticks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(int sign, Label F=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, int N, int n=, real Step=, real step=, bool begin=, bool end=, tickvalues modify(tickvalues)=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); +real maxlength(triple f(pair z), pair a, pair b, int nu, int nv); +void drawtick(picture pic, real[][] T, path3 g, path3 g2, ticklocate locate, real val, real Size, int sign, pen p, bool extend); +triple tickMin3(picture pic); +triple tickMax3(picture pic); +triple Scale(picture pic=, triple v); +triple[][] Scale(picture pic=, triple[][] P); +real ScaleX(picture pic=, real x); +real ScaleY(picture pic=, real y); +real ScaleZ(picture pic=, real z); +real[][] ScaleZ(picture pic=, real[][] P); +picture vectorfield(path3 vector(pair v), triple f(pair z), pair a, pair b, int nu=, int nv=, bool truesize=, real maxlength=, bool cond(pair z)=, pen p=, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=, string name=, render render=); +path3 Circle(triple c, real r, triple normal=, int n=); +void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(Label format=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, int N=, int n=, real Step=, real step=, bool begin=, bool end=, tickvalues modify(tickvalues)=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); +void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(Label format=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, real[] Ticks, real[] ticks=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); +void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=); +void Spline(flatguide3)(... void(flatguide3)[]); +void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(Label format=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, int N=, int n=, real Step=, real step=, bool begin=, bool end=, tickvalues modify(tickvalues)=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); +void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(Label format=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, real[] Ticks, real[] ticks=, real Size=, real size=, bool extend=, pen pTick=, pen ptick=); +void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=); +void axes3(picture pic=, Label xlabel=, Label ylabel=, Label zlabel=, bool extend=, triple min=, triple max=, pen p=, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, marginT3 margin(path3, pen)=); +void label(picture pic, Label L, triple v, real x, align align, string format, pen p); +void labelx(picture pic=, Label L=, triple v, align align=, string format=, pen p=); +void labely(picture pic=, Label L=, triple v, align align=, string format=, pen p=); +void labeltick(picture pic, real[][] T, path3 g, ticklocate locate, real val, int sign, real Size, string ticklabel(real), Label F, real norm=); +void labelaxis(picture pic, real[][] T, Label L, path3 g, ticklocate locate=, int sign=, bool ticklabels=); +void labelx3(picture pic=, Label L=, real x, align align=, string format=, pen p=); +void labely3(picture pic=, Label L=, real y, align align=, string format=, pen p=); +void labelz(picture pic=, Label L=, triple v, align align=, string format=, pen p=); +void labelz3(picture pic=, Label L=, real z, align align=, string format=, pen p=); +void autoscale3(picture pic=, void axis(picture, axisT)); +void xtick(picture pic=, triple v, triple dir=, real size=, pen p=); +void xtick(picture pic=, Label L, triple v, triple dir=, string format=, real size=, pen p=); +void ytick(picture pic=, triple v, triple dir=, real size=, pen p=); +void ytick(picture pic=, Label L, triple v, triple dir=, string format=, real size=, pen p=); +void xtick3(picture pic=, real x, triple dir=, real size=, pen p=); +void xtick3(picture pic=, Label L, real x, triple dir=, string format=, real size=, pen p=); +void ytick3(picture pic=, real y, triple dir=, real size=, pen p=); +void ytick3(picture pic=, Label L, real y, triple dir=, string format=, real size=, pen p=); +void ztick(picture pic=, triple v, triple dir=, real size=, pen p=); +void ztick(picture pic=, Label L, triple v, triple dir=, string format=, real size=, pen p=); +void ztick3(picture pic=, real z, triple dir=, real size=, pen p=); +void ztick3(picture pic=, Label L, real z, triple dir=, string format=, real size=, pen p=); +triple defaultdir(triple X, triple Y, triple Z, bool opposite=, projection P); +real xtrans(real[][] t, real x); +real ytrans(real[][] t, real y); +real ztrans(real[][] t, real z); +ticklocate ticklocate(real a, real b, autoscaleT S=, real tickmin=, real tickmax=, real time(real)=, triple dir(real)); +triple ticklabelshift(triple align, pen p=); +path3 Arc(triple c, triple v1, triple v2, triple normal=, bool direction=, int n=); +path3 Arc(triple c, real r, real theta1, real phi1, real theta2, real phi2, triple normal=, bool direction, int n=); +path3 Arc(triple c, real r, real theta1, real phi1, real theta2, real phi2, triple normal=, int n=); +void limits(picture pic=, triple min, triple max); +void XZEquals(picture, axisT)(real x, real z, triple align=, bool extend=); +void YZEquals(picture, axisT)(real y, real z, triple align=, bool extend=); +void XYZero(picture, axisT)(triple align=, bool extend=); +void XYZero(picture, axisT); +void zlimits(picture pic=, real min=, real max=, bool crop=); +void tick(picture pic=, triple v, triple dir, real size=, pen p=); +void tick(picture pic=, Label L, real value, triple v, triple dir, string format=, real size=, pen p=); +surface bispline(real[][] z, real[][] p, real[][] q, real[][] r, real[] x, real[] y, bool[][] cond=); +real[][][] bispline(real[][] f, real[] x, real[] y, real[] xsplinetype(real[], real[])=, real[] ysplinetype(real[], real[])=, bool[][] cond=); +real[][][] bispline0(real[][] z, real[][] p, real[][] q, real[][] r, real[] x, real[] y, bool[][] cond=); +real[] uniform(real T(real x), real Tinv(real x), real a, real b, int n); +void NoTicks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=)(); +void NoTicks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=, bool primary=); bool Crop; int ngraph; real epsilon; @@ -3229,9 +3229,9 @@ grid3(picture pic)[][] operator cast(grid3 gridroutine(picture pic)); triple X(picture pic); triple Y(picture pic); triple Z(picture pic); -position middle; grid3(picture pic)[] XYXgrid(position pos=); grid3(picture pic)[] XYXgrid; +position middle; grid3(picture pic)[] XY_XZgrid(position posa=, position posb=); grid3(picture pic)[] XY_XZgrid; grid3(picture pic)[] ZX_ZYgrid(position posa=, position posb=); @@ -3244,10 +3244,10 @@ void grid3(picture pic=, grid3(picture pic)[][] gridroutine=, void grid3(picture pic=, grid3(picture pic)[][] gridroutine, int N=, int n=, real Step=, real step=, bool begin=, bool end=, pen[] pGrid, pen[] pgrid, bool above=); ticksgridT OutTicks()(Label F=, string ticklabel(real)=, bool beginlabel=, bool endlabel=, int N=, int n=, real Step=, real step=, bool begin=, bool end=, real Size=, real size=, pen pTick=, pen ptick=, grid3(picture pic)[][] gridroutine, pen pGrid=, pen pgrid=); triple YZ(picture pic); +triple ZX(picture pic); void xaxis3(picture pic=, Label L=, void axis(picture, axisT)=, pen p=, ticksgridT ticks(), bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, bool above=); void yaxis3(picture pic=, Label L=, void axis(picture, axisT)=, pen p=, ticksgridT ticks(), bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, bool above=); void zaxis3(picture pic=, Label L=, void axis(picture, axisT)=, pen p=, ticksgridT ticks(), bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=, bool above=); -triple ZX(picture pic); grid3(picture pic)[] ZXZgrid(position pos=); grid3(picture pic)[] ZXZgrid; position top; @@ -3279,16 +3279,16 @@ horner diffdiv(real[] x, real[] y); horner hdiffdiv(real[] x, real[] y, real[] dy); horner operator init(); real fhorner(real)(horner sh); -surface labelpath(string s, path3 p, real angle=, triple optional=); -triple[] firstframe(path3 p, triple optional=); -triple[] nextframe(path3 p, real reltimestart, triple[] start, real reltimeend, int subdiv=); -real eps; -triple nextnormal(triple p, triple q); void labelpath(frame f, Label L, path g, string justify=, pen p=); void labelpath(picture pic=, Label L, path g, string justify=, pen p=); string LeftJustified; string Centered; string RightJustified; +surface labelpath(string s, path3 p, real angle=, triple optional=); +triple[] firstframe(path3 p, triple optional=); +triple[] nextframe(path3 p, real reltimestart, triple[] start, real reltimeend, int subdiv=); +real eps; +triple nextnormal(triple p, triple q); string[] lm_infmsg; void lm_qrfac(int m, int n, real[] a, bool pivot, int[] ipvt, real[] rdiag, real[] acnorm, real[] wa); void lm_qrsolv(int n, real[] r, int ldr, int[] ipvt, real[] diag, real[] qtb, real[] x, real[] sdiag, real[] wa); @@ -3380,12 +3380,12 @@ real acot(real x); pair[][] fft(pair[][] a, int sign=); real slope(path g, real x, int n=, real fuzz=); real slope(path g, explicit pair z, int n=, real fuzz=); -int[][] segmentlimits(bool[] b); -int[][] segment(bool[] b); picture grid(int Nx, int Ny, pen p=); rootfinder_settings operator init(); real frac(real x); real asec(real x); +int[][] segmentlimits(bool[] b); +int[][] segment(bool[] b); real time(path g, real x, int n=, real fuzz=); real time(path g, explicit pair z, int n=, real fuzz=); real[] leastsquares(real[][] A, real[] b, bool warn=); @@ -3714,6 +3714,7 @@ linefit operator init(); real Gaussrand(); real skewness(real[] A); linefit leastsquares(real[] x, real[] y); +linefit leastsquares(real[] x, real[] y, real[] w); real kurtosis(real[] A); real kurtosisexcess(real[] A); Relation r4a; -- cgit v1.2.3