diff options
author | Karl Berry <karl@freefriends.org> | 2010-04-19 23:59:33 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-04-19 23:59:33 +0000 |
commit | dddce3148a2bc785603576b18ffcf72d39adbe47 (patch) | |
tree | 14f4c79ef11bcf0820a8d4ff2ab0c5ac009c365c /Build/source/utils/asymptote/runarray.cc | |
parent | a01e51b01f5819b6091af48cdca581e9f2a9282e (diff) |
asy 1.93
git-svn-id: svn://tug.org/texlive/trunk@17934 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/asymptote/runarray.cc')
-rw-r--r-- | Build/source/utils/asymptote/runarray.cc | 482 |
1 files changed, 245 insertions, 237 deletions
diff --git a/Build/source/utils/asymptote/runarray.cc b/Build/source/utils/asymptote/runarray.cc index 0413af229b5..b7c06461911 100644 --- a/Build/source/utils/asymptote/runarray.cc +++ b/Build/source/utils/asymptote/runarray.cc @@ -49,12 +49,14 @@ array *copyArray(array *a); array *copyArray2(array *a); array *copyArray3(array *a); -double *copyArrayC(const array *a, size_t dim=0); -double *copyArray2C(const array *a, bool square=true, size_t dim2=0); +double *copyArrayC(const array *a, size_t dim=0, GCPlacement placement=NoGC); +double *copyArray2C(const array *a, bool square=true, size_t dim2=0, + GCPlacement placement=NoGC); triple *copyTripleArrayC(const array *a, size_t dim=0); triple *copyTripleArray2C(const array *a, bool square=true, size_t dim2=0); -double *copyTripleArray2Components(array *a, bool square=true, size_t dim2=0); +double *copyTripleArray2Components(array *a, bool square=true, size_t dim2=0, + GCPlacement placement=NoGC); } function *realRealFunction(); @@ -172,10 +174,11 @@ inline size_t checkdimension(const array *a, size_t dim) return size; } -double *copyArrayC(const array *a, size_t dim) +double *copyArrayC(const array *a, size_t dim, GCPlacement placement) { size_t size=checkdimension(a,dim); - double *c=new double[size]; + double *c=(placement == NoGC) ? new double [size] : + new(placement) double[size]; for(size_t i=0; i < size; i++) c[i]=read<double>(a,i); return c; @@ -226,7 +229,8 @@ array *copyArray3(array *a) return c; } -double *copyArray2C(const array *a, bool square, size_t dim2) +double *copyArray2C(const array *a, bool square, size_t dim2, + GCPlacement placement) { size_t n=checkArray(a); size_t m=(square || n == 0) ? n : checkArray(read<array*>(a,0)); @@ -236,7 +240,7 @@ double *copyArray2C(const array *a, bool square, size_t dim2) error(buf); } - double *c=new double[n*m]; + double *c=(placement == NoGC) ? new double [n*m] : new(placement) double[n*m]; for(size_t i=0; i < n; i++) { array *ai=read<array*>(a,i); size_t aisize=checkArray(ai); @@ -274,7 +278,8 @@ triple *copyTripleArray2C(const array *a, bool square, size_t dim2) return c; } -double *copyTripleArray2Components(array *a, bool square, size_t dim2) +double *copyTripleArray2Components(array *a, bool square, size_t dim2, + GCPlacement placement) { size_t n=checkArray(a); size_t m=(square || n == 0) ? n : checkArray(read<array*>(a,0)); @@ -285,7 +290,8 @@ double *copyTripleArray2Components(array *a, bool square, size_t dim2) } size_t nm=n*m; - double *cx=new double[3*nm]; + double *cx=(placement == NoGC) ? new double [3*nm] : + new(placement) double[3*nm]; double *cy=cx+nm; double *cz=cx+2*nm; for(size_t i=0; i < n; i++) { @@ -519,10 +525,10 @@ void integeroverflow(size_t i) namespace run { // Create an empty array. -#line 475 "runarray.in" +#line 479 "runarray.in" void emptyArray(stack *Stack) { -#line 476 "runarray.in" +#line 480 "runarray.in" {Stack->push<array*>(new array(0)); return;} } @@ -531,11 +537,11 @@ void emptyArray(stack *Stack) // is popped off the stack, followed by each dimension in reverse order. // The array itself is technically a one dimensional array of one // dimension arrays and so on. -#line 485 "runarray.in" +#line 489 "runarray.in" void newDeepArray(stack *Stack) { Int depth=vm::pop<Int>(Stack); -#line 486 "runarray.in" +#line 490 "runarray.in" assert(depth > 0); Int *dims = new Int[depth]; @@ -554,11 +560,11 @@ void newDeepArray(stack *Stack) // Creates an array with elements already specified. First, the number // of elements is popped off the stack, followed by each element in // reverse order. -#line 505 "runarray.in" +#line 509 "runarray.in" void newInitializedArray(stack *Stack) { Int n=vm::pop<Int>(Stack); -#line 506 "runarray.in" +#line 510 "runarray.in" assert(n >= 0); array *a = new array(n); @@ -571,12 +577,12 @@ void newInitializedArray(stack *Stack) // Similar to newInitializedArray, but after the n elements, append another // array to it. -#line 519 "runarray.in" +#line 523 "runarray.in" void newAppendedArray(stack *Stack) { Int n=vm::pop<Int>(Stack); array* tail=vm::pop<array*>(Stack); -#line 520 "runarray.in" +#line 524 "runarray.in" assert(n >= 0); array *a = new array(n); @@ -591,13 +597,13 @@ void newAppendedArray(stack *Stack) // The function T[] array(int n, T value, int depth=0) produces a array of n // copies of x, where each copy is copied up to depth. -#line 535 "runarray.in" +#line 539 "runarray.in" void newDuplicateArray(stack *Stack) { Int depth=vm::pop<Int>(Stack,Int_MAX); item value=vm::pop(Stack); Int n=vm::pop<Int>(Stack); -#line 536 "runarray.in" +#line 540 "runarray.in" if(n < 0) error("cannot create a negative length array"); if(depth < 0) error("cannot copy to a negative depth"); @@ -605,12 +611,12 @@ void newDuplicateArray(stack *Stack) } // Read an element from an array. Checks for initialization & bounds. -#line 544 "runarray.in" +#line 548 "runarray.in" void arrayRead(stack *Stack) { Int n=vm::pop<Int>(Stack); array * a=vm::pop<array *>(Stack); -#line 545 "runarray.in" +#line 549 "runarray.in" item& i=arrayRead(a,n); if (i.empty()) { ostringstream buf; @@ -621,50 +627,50 @@ void arrayRead(stack *Stack) } // Slice a substring from an array. -#line 556 "runarray.in" +#line 560 "runarray.in" void arraySliceRead(stack *Stack) { Int right=vm::pop<Int>(Stack); Int left=vm::pop<Int>(Stack); array * a=vm::pop<array *>(Stack); -#line 557 "runarray.in" +#line 561 "runarray.in" checkArray(a); {Stack->push(a->slice(left, right)); return;} } // Slice a substring from an array. This implements the cases a[i:] and a[:] // where the endpoint is not given, and assumed to be the length of the array. -#line 564 "runarray.in" +#line 568 "runarray.in" void arraySliceReadToEnd(stack *Stack) { Int left=vm::pop<Int>(Stack); array * a=vm::pop<array *>(Stack); -#line 565 "runarray.in" +#line 569 "runarray.in" size_t len=checkArray(a); {Stack->push(a->slice(left, (Int)len)); return;} } // Read an element from an array of arrays. Check bounds and initialize // as necessary. -#line 572 "runarray.in" +#line 576 "runarray.in" void arrayArrayRead(stack *Stack) { Int n=vm::pop<Int>(Stack); array * a=vm::pop<array *>(Stack); -#line 573 "runarray.in" +#line 577 "runarray.in" item& i=arrayRead(a,n); if (i.empty()) i=new array(0); {Stack->push(i); return;} } // Write an element to an array. Increase size if necessary. -#line 580 "runarray.in" +#line 584 "runarray.in" void arrayWrite(stack *Stack) { Int n=vm::pop<Int>(Stack); array * a=vm::pop<array *>(Stack); item value=vm::pop(Stack); -#line 581 "runarray.in" +#line 585 "runarray.in" size_t len=checkArray(a); bool cyclic=a->cyclic(); if(cyclic && len > 0) n=imod(n,len); @@ -678,27 +684,27 @@ void arrayWrite(stack *Stack) {Stack->push(value); return;} } -#line 595 "runarray.in" +#line 599 "runarray.in" void arraySliceWrite(stack *Stack) { Int right=vm::pop<Int>(Stack); Int left=vm::pop<Int>(Stack); array * dest=vm::pop<array *>(Stack); array * src=vm::pop<array *>(Stack); -#line 596 "runarray.in" +#line 600 "runarray.in" checkArray(src); checkArray(dest); dest->setSlice(left, right, src); {Stack->push<array*>(src); return;} } -#line 603 "runarray.in" +#line 607 "runarray.in" void arraySliceWriteToEnd(stack *Stack) { Int left=vm::pop<Int>(Stack); array * dest=vm::pop<array *>(Stack); array * src=vm::pop<array *>(Stack); -#line 604 "runarray.in" +#line 608 "runarray.in" checkArray(src); size_t len=checkArray(dest); dest->setSlice(left, (Int) len, src); @@ -706,20 +712,20 @@ void arraySliceWriteToEnd(stack *Stack) } // Returns the length of an array. -#line 612 "runarray.in" +#line 616 "runarray.in" void arrayLength(stack *Stack) { array * a=vm::pop<array *>(Stack); -#line 613 "runarray.in" +#line 617 "runarray.in" {Stack->push<Int>((Int) checkArray(a)); return;} } // Returns an array of integers representing the keys of the array. -#line 618 "runarray.in" +#line 622 "runarray.in" void arrayKeys(stack *Stack) { array * a=vm::pop<array *>(Stack); -#line 619 "runarray.in" +#line 623 "runarray.in" size_t size=checkArray(a); array *keys=new array(); @@ -733,33 +739,33 @@ void arrayKeys(stack *Stack) } // Return the cyclic flag for an array. -#line 633 "runarray.in" +#line 637 "runarray.in" void arrayCyclicFlag(stack *Stack) { array * a=vm::pop<array *>(Stack); -#line 634 "runarray.in" +#line 638 "runarray.in" checkArray(a); {Stack->push<bool>(a->cyclic()); return;} } -#line 639 "runarray.in" +#line 643 "runarray.in" void arraySetCyclicFlag(stack *Stack) { array * a=vm::pop<array *>(Stack); bool b=vm::pop<bool>(Stack); -#line 640 "runarray.in" +#line 644 "runarray.in" checkArray(a); a->cyclic(b); {Stack->push<bool>(b); return;} } // Check to see if an array element is initialized. -#line 647 "runarray.in" +#line 651 "runarray.in" void arrayInitializedHelper(stack *Stack) { array * a=vm::pop<array *>(Stack); Int n=vm::pop<Int>(Stack); -#line 648 "runarray.in" +#line 652 "runarray.in" size_t len=checkArray(a); bool cyclic=a->cyclic(); if(cyclic && len > 0) n=imod(n,len); @@ -769,62 +775,62 @@ void arrayInitializedHelper(stack *Stack) } // Returns the initialize method for an array. -#line 658 "runarray.in" +#line 662 "runarray.in" void arrayInitialized(stack *Stack) { array * a=vm::pop<array *>(Stack); -#line 659 "runarray.in" +#line 663 "runarray.in" {Stack->push<callable*>(new thunk(new bfunc(arrayInitializedHelper),a)); return;} } // The helper function for the cyclic method that sets the cyclic flag. -#line 664 "runarray.in" +#line 668 "runarray.in" void arrayCyclicHelper(stack *Stack) { array * a=vm::pop<array *>(Stack); bool b=vm::pop<bool>(Stack); -#line 665 "runarray.in" +#line 669 "runarray.in" checkArray(a); a->cyclic(b); } // Set the cyclic flag for an array. -#line 671 "runarray.in" +#line 675 "runarray.in" void arrayCyclic(stack *Stack) { array * a=vm::pop<array *>(Stack); -#line 672 "runarray.in" +#line 676 "runarray.in" {Stack->push<callable*>(new thunk(new bfunc(arrayCyclicHelper),a)); return;} } // The helper function for the push method that does the actual operation. -#line 677 "runarray.in" +#line 681 "runarray.in" void arrayPushHelper(stack *Stack) { array * a=vm::pop<array *>(Stack); item x=vm::pop(Stack); -#line 678 "runarray.in" +#line 682 "runarray.in" checkArray(a); a->push(x); {Stack->push(x); return;} } // Returns the push method for an array. -#line 685 "runarray.in" +#line 689 "runarray.in" void arrayPush(stack *Stack) { array * a=vm::pop<array *>(Stack); -#line 686 "runarray.in" +#line 690 "runarray.in" {Stack->push<callable*>(new thunk(new bfunc(arrayPushHelper),a)); return;} } // The helper function for the append method that appends b to a. -#line 691 "runarray.in" +#line 695 "runarray.in" void arrayAppendHelper(stack *Stack) { array * a=vm::pop<array *>(Stack); array * b=vm::pop<array *>(Stack); -#line 692 "runarray.in" +#line 696 "runarray.in" checkArray(a); size_t size=checkArray(b); for(size_t i=0; i < size; i++) @@ -832,20 +838,20 @@ void arrayAppendHelper(stack *Stack) } // Returns the append method for an array. -#line 700 "runarray.in" +#line 704 "runarray.in" void arrayAppend(stack *Stack) { array * a=vm::pop<array *>(Stack); -#line 701 "runarray.in" +#line 705 "runarray.in" {Stack->push<callable*>(new thunk(new bfunc(arrayAppendHelper),a)); return;} } // The helper function for the pop method. -#line 706 "runarray.in" +#line 710 "runarray.in" void arrayPopHelper(stack *Stack) { array * a=vm::pop<array *>(Stack); -#line 707 "runarray.in" +#line 711 "runarray.in" size_t asize=checkArray(a); if(asize == 0) error("cannot pop element from empty array"); @@ -853,22 +859,22 @@ void arrayPopHelper(stack *Stack) } // Returns the pop method for an array. -#line 715 "runarray.in" +#line 719 "runarray.in" void arrayPop(stack *Stack) { array * a=vm::pop<array *>(Stack); -#line 716 "runarray.in" +#line 720 "runarray.in" {Stack->push<callable*>(new thunk(new bfunc(arrayPopHelper),a)); return;} } // The helper function for the insert method. -#line 721 "runarray.in" +#line 725 "runarray.in" void arrayInsertHelper(stack *Stack) { array * a=vm::pop<array *>(Stack); array * x=vm::pop<array *>(Stack); Int i=vm::pop<Int>(Stack); -#line 722 "runarray.in" +#line 726 "runarray.in" size_t asize=checkArray(a); checkArray(x); if(a->cyclic() && asize > 0) i=imod(i,asize); @@ -878,39 +884,39 @@ void arrayInsertHelper(stack *Stack) } // Returns the insert method for an array. -#line 732 "runarray.in" +#line 736 "runarray.in" void arrayInsert(stack *Stack) { array * a=vm::pop<array *>(Stack); -#line 733 "runarray.in" +#line 737 "runarray.in" {Stack->push<callable*>(new thunk(new bfunc(arrayInsertHelper),a)); return;} } // Returns the delete method for an array. -#line 738 "runarray.in" +#line 742 "runarray.in" void arrayDelete(stack *Stack) { array * a=vm::pop<array *>(Stack); -#line 739 "runarray.in" +#line 743 "runarray.in" {Stack->push<callable*>(new thunk(new bfunc(arrayDeleteHelper),a)); return;} } -#line 743 "runarray.in" +#line 747 "runarray.in" void arrayAlias(stack *Stack) { array * b=vm::pop<array *>(Stack); array * a=vm::pop<array *>(Stack); -#line 744 "runarray.in" +#line 748 "runarray.in" {Stack->push<bool>(a==b); return;} } // Return array formed by indexing array a with elements of integer array b -#line 749 "runarray.in" +#line 753 "runarray.in" void arrayIntArray(stack *Stack) { array * b=vm::pop<array *>(Stack); array * a=vm::pop<array *>(Stack); -#line 750 "runarray.in" +#line 754 "runarray.in" size_t asize=checkArray(a); size_t bsize=checkArray(b); array *r=new array(bsize); @@ -928,13 +934,13 @@ void arrayIntArray(stack *Stack) // returns the complement of the integer array a in {0,2,...,n-1}, // so that b[complement(a,b.length)] yields the complement of b[a]. -#line 768 "runarray.in" +#line 772 "runarray.in" // Intarray* complement(Intarray *a, Int n); void gen_runarray31(stack *Stack) { Int n=vm::pop<Int>(Stack); Intarray * a=vm::pop<Intarray *>(Stack); -#line 769 "runarray.in" +#line 773 "runarray.in" size_t asize=checkArray(a); array *r=new array(0); bool *keep=new bool[n]; @@ -951,12 +957,12 @@ void gen_runarray31(stack *Stack) } // Generate the sequence {f(i) : i=0,1,...n-1} given a function f and integer n -#line 786 "runarray.in" +#line 790 "runarray.in" void arraySequence(stack *Stack) { Int n=vm::pop<Int>(Stack); callable * f=vm::pop<callable *>(Stack); -#line 787 "runarray.in" +#line 791 "runarray.in" if(n < 0) n=0; array *a=new array(n); for(Int i=0; i < n; ++i) { @@ -968,12 +974,12 @@ void arraySequence(stack *Stack) } // Return the array {0,1,...n-1} -#line 799 "runarray.in" +#line 803 "runarray.in" // Intarray* sequence(Int n); void gen_runarray33(stack *Stack) { Int n=vm::pop<Int>(Stack); -#line 800 "runarray.in" +#line 804 "runarray.in" if(n < 0) n=0; array *a=new array(n); for(Int i=0; i < n; ++i) { @@ -983,12 +989,12 @@ void gen_runarray33(stack *Stack) } // Apply a function to each element of an array -#line 810 "runarray.in" +#line 814 "runarray.in" void arrayFunction(stack *Stack) { array * a=vm::pop<array *>(Stack); callable * f=vm::pop<callable *>(Stack); -#line 811 "runarray.in" +#line 815 "runarray.in" size_t size=checkArray(a); array *b=new array(size); for(size_t i=0; i < size; ++i) { @@ -999,12 +1005,12 @@ void arrayFunction(stack *Stack) {Stack->push<array*>(b); return;} } -#line 822 "runarray.in" +#line 826 "runarray.in" void arraySort(stack *Stack) { callable * f=vm::pop<callable *>(Stack); array * a=vm::pop<array *>(Stack); -#line 823 "runarray.in" +#line 827 "runarray.in" array *c=copyArray(a); compareFunc=f; FuncStack=Stack; @@ -1012,12 +1018,12 @@ void arraySort(stack *Stack) {Stack->push<array*>(c); return;} } -#line 831 "runarray.in" +#line 835 "runarray.in" // bool all(boolarray *a); void gen_runarray36(stack *Stack) { boolarray * a=vm::pop<boolarray *>(Stack); -#line 832 "runarray.in" +#line 836 "runarray.in" size_t size=checkArray(a); bool c=true; for(size_t i=0; i < size; i++) @@ -1025,12 +1031,12 @@ void gen_runarray36(stack *Stack) {Stack->push<bool>(c); return;} } -#line 840 "runarray.in" +#line 844 "runarray.in" // boolarray* !(boolarray* a); void gen_runarray37(stack *Stack) { boolarray* a=vm::pop<boolarray*>(Stack); -#line 841 "runarray.in" +#line 845 "runarray.in" size_t size=checkArray(a); array *c=new array(size); for(size_t i=0; i < size; i++) @@ -1038,12 +1044,12 @@ void gen_runarray37(stack *Stack) {Stack->push<boolarray*>(c); return;} } -#line 849 "runarray.in" +#line 853 "runarray.in" // Int sum(boolarray *a); void gen_runarray38(stack *Stack) { boolarray * a=vm::pop<boolarray *>(Stack); -#line 850 "runarray.in" +#line 854 "runarray.in" size_t size=checkArray(a); Int sum=0; for(size_t i=0; i < size; i++) @@ -1051,19 +1057,19 @@ void gen_runarray38(stack *Stack) {Stack->push<Int>(sum); return;} } -#line 858 "runarray.in" +#line 862 "runarray.in" void arrayCopy(stack *Stack) { array * a=vm::pop<array *>(Stack); -#line 859 "runarray.in" +#line 863 "runarray.in" {Stack->push<array*>(copyArray(a)); return;} } -#line 863 "runarray.in" +#line 867 "runarray.in" void arrayConcat(stack *Stack) { array * a=vm::pop<array *>(Stack); -#line 864 "runarray.in" +#line 868 "runarray.in" // a is an array of arrays to be concatenated together. // The signature is // T[] concat(... T[][] a); @@ -1090,27 +1096,27 @@ void arrayConcat(stack *Stack) {Stack->push<array*>(result); return;} } -#line 891 "runarray.in" +#line 895 "runarray.in" void array2Copy(stack *Stack) { array * a=vm::pop<array *>(Stack); -#line 892 "runarray.in" +#line 896 "runarray.in" {Stack->push<array*>(copyArray2(a)); return;} } -#line 896 "runarray.in" +#line 900 "runarray.in" void array3Copy(stack *Stack) { array * a=vm::pop<array *>(Stack); -#line 897 "runarray.in" +#line 901 "runarray.in" {Stack->push<array*>(copyArray3(a)); return;} } -#line 901 "runarray.in" +#line 905 "runarray.in" void array2Transpose(stack *Stack) { array * a=vm::pop<array *>(Stack); -#line 902 "runarray.in" +#line 906 "runarray.in" size_t asize=checkArray(a); array *c=new array(0); for(size_t i=0; i < asize; i++) { @@ -1137,12 +1143,12 @@ void array2Transpose(stack *Stack) // permutation (021 or 120, etc; original is 012). // Transpose by sending respective members to the permutated locations: // return the array obtained by putting a[i][j][k] into position perm{ijk}. -#line 929 "runarray.in" +#line 933 "runarray.in" void array3Transpose(stack *Stack) { array * perm=vm::pop<array *>(Stack); array * a=vm::pop<array *>(Stack); -#line 930 "runarray.in" +#line 934 "runarray.in" const size_t DIM=3; if(checkArray(perm) != DIM) { @@ -1226,13 +1232,13 @@ void array3Transpose(stack *Stack) // In a boolean array, find the index of the nth true value or -1 if not found // If n is negative, search backwards. -#line 1014 "runarray.in" +#line 1018 "runarray.in" // Int find(boolarray *a, Int n=1); void gen_runarray45(stack *Stack) { Int n=vm::pop<Int>(Stack,1); boolarray * a=vm::pop<boolarray *>(Stack); -#line 1015 "runarray.in" +#line 1019 "runarray.in" size_t size=checkArray(a); Int j=-1; if(n > 0) @@ -1250,13 +1256,13 @@ void gen_runarray45(stack *Stack) // construct vector obtained by replacing those elements of b for which the // corresponding elements of a are false by the corresponding element of c. -#line 1033 "runarray.in" +#line 1037 "runarray.in" void arrayConditional(stack *Stack) { array * c=vm::pop<array *>(Stack); array * b=vm::pop<array *>(Stack); array * a=vm::pop<array *>(Stack); -#line 1034 "runarray.in" +#line 1038 "runarray.in" size_t size=checkArray(a); array *r=new array(size); if(b && c) { @@ -1280,21 +1286,21 @@ void arrayConditional(stack *Stack) } // Return an n x n identity matrix. -#line 1058 "runarray.in" +#line 1062 "runarray.in" // realarray2* identity(Int n); void gen_runarray47(stack *Stack) { Int n=vm::pop<Int>(Stack); -#line 1059 "runarray.in" +#line 1063 "runarray.in" {Stack->push<realarray2*>(Identity(n)); return;} } // Return the diagonal matrix with diagonal entries given by a. -#line 1064 "runarray.in" +#line 1068 "runarray.in" void diagonal(stack *Stack) { realarray * a=vm::pop<realarray *>(Stack); -#line 1065 "runarray.in" +#line 1069 "runarray.in" size_t n=checkArray(a); array *c=new array(n); for(size_t i=0; i < n; ++i) { @@ -1310,12 +1316,12 @@ void diagonal(stack *Stack) } // Return the inverse of an n x n matrix a using Gauss-Jordan elimination. -#line 1081 "runarray.in" +#line 1085 "runarray.in" // realarray2* inverse(realarray2 *a); void gen_runarray49(stack *Stack) { realarray2 * a=vm::pop<realarray2 *>(Stack); -#line 1082 "runarray.in" +#line 1086 "runarray.in" a=copyArray2(a); size_t n=checkArray(a); checkSquare(a); @@ -1408,14 +1414,14 @@ void gen_runarray49(stack *Stack) // Solve the linear equation ax=b by LU decomposition, returning the // solution x, where a is an n x n matrix and b is an array of length n. // If no solution exists, return an empty array. -#line 1175 "runarray.in" +#line 1179 "runarray.in" // realarray* solve(realarray2 *a, realarray *b, bool warn=true); void gen_runarray50(stack *Stack) { bool warn=vm::pop<bool>(Stack,true); realarray * b=vm::pop<realarray *>(Stack); realarray2 * a=vm::pop<realarray2 *>(Stack); -#line 1176 "runarray.in" +#line 1180 "runarray.in" size_t n=checkArray(a); if(n == 0) {Stack->push<realarray*>(new array(0)); return;} @@ -1465,14 +1471,14 @@ void gen_runarray50(stack *Stack) // Solve the linear equation ax=b by LU decomposition, returning the // solution x, where a is an n x n matrix and b is an n x m matrix. // If no solution exists, return an empty array. -#line 1226 "runarray.in" +#line 1230 "runarray.in" // realarray2* solve(realarray2 *a, realarray2 *b, bool warn=true); void gen_runarray51(stack *Stack) { bool warn=vm::pop<bool>(Stack,true); realarray2 * b=vm::pop<realarray2 *>(Stack); realarray2 * a=vm::pop<realarray2 *>(Stack); -#line 1227 "runarray.in" +#line 1231 "runarray.in" size_t n=checkArray(a); if(n == 0) {Stack->push<realarray2*>(new array(0)); return;} @@ -1533,12 +1539,12 @@ void gen_runarray51(stack *Stack) } // Compute the determinant of an n x n matrix. -#line 1288 "runarray.in" +#line 1292 "runarray.in" // real determinant(realarray2 *a); void gen_runarray52(stack *Stack) { realarray2 * a=vm::pop<realarray2 *>(Stack); -#line 1289 "runarray.in" +#line 1293 "runarray.in" real *A=copyArray2C(a); size_t n=checkArray(a); @@ -1552,13 +1558,13 @@ void gen_runarray52(stack *Stack) {Stack->push<real>(det); return;} } -#line 1303 "runarray.in" +#line 1307 "runarray.in" // realarray* *(realarray2 *a, realarray *b); void gen_runarray53(stack *Stack) { realarray * b=vm::pop<realarray *>(Stack); realarray2 * a=vm::pop<realarray2 *>(Stack); -#line 1304 "runarray.in" +#line 1308 "runarray.in" size_t n=checkArray(a); size_t m=checkArray(b); array *c=new array(n); @@ -1575,13 +1581,13 @@ void gen_runarray53(stack *Stack) {Stack->push<realarray*>(c); return;} } -#line 1321 "runarray.in" +#line 1325 "runarray.in" // realarray* *(realarray *a, realarray2 *b); void gen_runarray54(stack *Stack) { realarray2 * b=vm::pop<realarray2 *>(Stack); realarray * a=vm::pop<realarray *>(Stack); -#line 1322 "runarray.in" +#line 1326 "runarray.in" size_t n=checkArray(a); if(n != checkArray(b)) error(incommensurate); real *A=copyArrayC(a); @@ -1608,13 +1614,13 @@ void gen_runarray54(stack *Stack) {Stack->push<realarray*>(c); return;} } -#line 1349 "runarray.in" +#line 1353 "runarray.in" // realarray2* *(realarray2 *a, realarray2 *b); void gen_runarray55(stack *Stack) { realarray2 * b=vm::pop<realarray2 *>(Stack); realarray2 * a=vm::pop<realarray2 *>(Stack); -#line 1350 "runarray.in" +#line 1354 "runarray.in" size_t n=checkArray(a); size_t nb=checkArray(b); @@ -1648,23 +1654,23 @@ void gen_runarray55(stack *Stack) {Stack->push<realarray2*>(c); return;} } -#line 1384 "runarray.in" +#line 1388 "runarray.in" // triple *(realarray2 *t, triple v); void gen_runarray56(stack *Stack) { triple v=vm::pop<triple>(Stack); realarray2 * t=vm::pop<realarray2 *>(Stack); -#line 1385 "runarray.in" +#line 1389 "runarray.in" {Stack->push<triple>(*t*v); return;} } -#line 1389 "runarray.in" +#line 1393 "runarray.in" // pair project(triple v, realarray2 *t); void gen_runarray57(stack *Stack) { realarray2 * t=vm::pop<realarray2 *>(Stack); triple v=vm::pop<triple>(Stack); -#line 1390 "runarray.in" +#line 1394 "runarray.in" size_t n=checkArray(t); if(n != 4) error(incommensurate); array *t0=read<array*>(t,0); @@ -1689,13 +1695,13 @@ void gen_runarray57(stack *Stack) } // Compute the dot product of vectors a and b. -#line 1415 "runarray.in" +#line 1419 "runarray.in" // real dot(realarray *a, realarray *b); void gen_runarray58(stack *Stack) { realarray * b=vm::pop<realarray *>(Stack); realarray * a=vm::pop<realarray *>(Stack); -#line 1416 "runarray.in" +#line 1420 "runarray.in" size_t n=checkArrays(a,b); real sum=0.0; for(size_t i=0; i < n; ++i) @@ -1710,7 +1716,7 @@ void gen_runarray58(stack *Stack) // [ a[2] b[2] c[2] ] // [ ... ] // [ c[n-1] a[n-1] b[n-1] ] -#line 1431 "runarray.in" +#line 1435 "runarray.in" // realarray* tridiagonal(realarray *a, realarray *b, realarray *c, realarray *f); void gen_runarray59(stack *Stack) { @@ -1718,7 +1724,7 @@ void gen_runarray59(stack *Stack) realarray * c=vm::pop<realarray *>(Stack); realarray * b=vm::pop<realarray *>(Stack); realarray * a=vm::pop<realarray *>(Stack); -#line 1432 "runarray.in" +#line 1436 "runarray.in" size_t n=checkArrays(a,b); checkEqual(n,checkArray(c)); checkEqual(n,checkArray(f)); @@ -1815,7 +1821,7 @@ void gen_runarray59(stack *Stack) } // Root solve by Newton-Raphson -#line 1529 "runarray.in" +#line 1533 "runarray.in" // real newton(Int iterations=100, callableReal *f, callableReal *fprime, real x, bool verbose=false); void gen_runarray60(stack *Stack) { @@ -1824,7 +1830,7 @@ void gen_runarray60(stack *Stack) callableReal * fprime=vm::pop<callableReal *>(Stack); callableReal * f=vm::pop<callableReal *>(Stack); Int iterations=vm::pop<Int>(Stack,100); -#line 1531 "runarray.in" +#line 1535 "runarray.in" static const real fuzz=1000.0*DBL_EPSILON; Int i=0; size_t oldPrec=0; @@ -1870,7 +1876,7 @@ void gen_runarray60(stack *Stack) // Root solve by Newton-Raphson bisection // cf. routine rtsafe (Press et al., Numerical Recipes, 1991). -#line 1577 "runarray.in" +#line 1581 "runarray.in" // real newton(Int iterations=100, callableReal *f, callableReal *fprime, real x1, real x2, bool verbose=false); void gen_runarray61(stack *Stack) { @@ -1880,7 +1886,7 @@ void gen_runarray61(stack *Stack) callableReal * fprime=vm::pop<callableReal *>(Stack); callableReal * f=vm::pop<callableReal *>(Stack); Int iterations=vm::pop<Int>(Stack,100); -#line 1579 "runarray.in" +#line 1583 "runarray.in" static const real fuzz=1000.0*DBL_EPSILON; size_t oldPrec=0; if(verbose) @@ -1958,7 +1964,7 @@ void gen_runarray61(stack *Stack) {Stack->push<real>((j == iterations) ? DBL_MAX : x); return;} } -#line 1657 "runarray.in" +#line 1661 "runarray.in" // real simpson(callableReal *f, real a, real b, real acc=DBL_EPSILON, real dxmax=0); void gen_runarray62(stack *Stack) { @@ -1967,9 +1973,9 @@ void gen_runarray62(stack *Stack) real b=vm::pop<real>(Stack); real a=vm::pop<real>(Stack); callableReal * f=vm::pop<callableReal *>(Stack); -#line 1659 "runarray.in" +#line 1663 "runarray.in" real integral; - if(dxmax == 0) dxmax=b-a; + if(dxmax <= 0) dxmax=fabs(b-a); Func=f; FuncStack=Stack; if(!simpson(integral,wrapFunction,a,b,acc,dxmax)) @@ -1978,17 +1984,18 @@ void gen_runarray62(stack *Stack) } // Compute the fast Fourier transform of a pair array -#line 1670 "runarray.in" -void pairArrayFFT(stack *Stack) +#line 1674 "runarray.in" +// pairarray* fft(pairarray *a, Int sign=1); +void gen_runarray63(stack *Stack) { Int sign=vm::pop<Int>(Stack,1); pairarray * a=vm::pop<pairarray *>(Stack); -#line 1671 "runarray.in" +#line 1675 "runarray.in" unsigned n=(unsigned) checkArray(a); #ifdef HAVE_LIBFFTW3 array *c=new array(n); if(n) { - Complex *f=FFTWComplex(n); + Complex *f=ComplexAlign(n); fft1d Forward(n,intcast(sign),f); for(size_t i=0; i < n; i++) { @@ -2001,22 +2008,23 @@ void pairArrayFFT(stack *Stack) Complex z=f[i]; (*c)[i]=pair(z.real(),z.imag()); } - FFTWdelete(f); + deleteAlign(f); } #else unused(&n); unused(&sign); array *c=new array(0); + error("Please install fftw3, run ./configure, and recompile"); #endif // HAVE_LIBFFTW3 {Stack->push<pairarray*>(c); return;} } -#line 1699 "runarray.in" +#line 1704 "runarray.in" // Intarray2* triangulate(pairarray *z); void gen_runarray64(stack *Stack) { pairarray * z=vm::pop<pairarray *>(Stack); -#line 1700 "runarray.in" +#line 1705 "runarray.in" size_t nv=checkArray(z); // Call robust version of Gilles Dumoulin's port of Paul Bourke's // triangulation code. @@ -2050,12 +2058,12 @@ void gen_runarray64(stack *Stack) {Stack->push<Intarray2*>(t); return;} } -#line 1734 "runarray.in" +#line 1739 "runarray.in" // real norm(realarray *a); void gen_runarray65(stack *Stack) { realarray * a=vm::pop<realarray *>(Stack); -#line 1735 "runarray.in" +#line 1740 "runarray.in" size_t n=checkArray(a); real M=0.0; for(size_t i=0; i < n; ++i) { @@ -2065,12 +2073,12 @@ void gen_runarray65(stack *Stack) {Stack->push<real>(M); return;} } -#line 1745 "runarray.in" +#line 1750 "runarray.in" // real norm(realarray2 *a); void gen_runarray66(stack *Stack) { realarray2 * a=vm::pop<realarray2 *>(Stack); -#line 1746 "runarray.in" +#line 1751 "runarray.in" size_t n=checkArray(a); real M=0.0; for(size_t i=0; i < n; ++i) { @@ -2084,12 +2092,12 @@ void gen_runarray66(stack *Stack) {Stack->push<real>(M); return;} } -#line 1760 "runarray.in" +#line 1765 "runarray.in" // real norm(triplearray2 *a); void gen_runarray67(stack *Stack) { triplearray2 * a=vm::pop<triplearray2 *>(Stack); -#line 1761 "runarray.in" +#line 1766 "runarray.in" size_t n=checkArray(a); real M=0.0; for(size_t i=0; i < n; ++i) { @@ -2103,12 +2111,12 @@ void gen_runarray67(stack *Stack) {Stack->push<real>(sqrt(M)); return;} } -#line 1775 "runarray.in" +#line 1780 "runarray.in" // real change2(triplearray2 *a); void gen_runarray68(stack *Stack) { triplearray2 * a=vm::pop<triplearray2 *>(Stack); -#line 1776 "runarray.in" +#line 1781 "runarray.in" size_t n=checkArray(a); if(n == 0) {Stack->push<real>(0.0); return;} @@ -2129,13 +2137,13 @@ void gen_runarray68(stack *Stack) {Stack->push<real>(M); return;} } -#line 1797 "runarray.in" +#line 1802 "runarray.in" // triple minbezier(triplearray2 *P, triple b); void gen_runarray69(stack *Stack) { triple b=vm::pop<triple>(Stack); triplearray2 * P=vm::pop<triplearray2 *>(Stack); -#line 1798 "runarray.in" +#line 1803 "runarray.in" real *A=copyTripleArray2Components(P,true,4); b=triple(bound(A,::min,b.getx(),sqrtFuzz*norm(A,16)), bound(A+16,::min,b.gety(),sqrtFuzz*norm(A+16,16)), @@ -2144,13 +2152,13 @@ void gen_runarray69(stack *Stack) {Stack->push<triple>(b); return;} } -#line 1807 "runarray.in" +#line 1812 "runarray.in" // triple maxbezier(triplearray2 *P, triple b); void gen_runarray70(stack *Stack) { triple b=vm::pop<triple>(Stack); triplearray2 * P=vm::pop<triplearray2 *>(Stack); -#line 1808 "runarray.in" +#line 1813 "runarray.in" real *A=copyTripleArray2Components(P,true,4); b=triple(bound(A,::max,b.getx(),sqrtFuzz*norm(A,16)), bound(A+16,::max,b.gety(),sqrtFuzz*norm(A+16,16)), @@ -2159,13 +2167,13 @@ void gen_runarray70(stack *Stack) {Stack->push<triple>(b); return;} } -#line 1817 "runarray.in" +#line 1822 "runarray.in" // pair minratio(triplearray2 *P, pair b); void gen_runarray71(stack *Stack) { pair b=vm::pop<pair>(Stack); triplearray2 * P=vm::pop<triplearray2 *>(Stack); -#line 1818 "runarray.in" +#line 1823 "runarray.in" triple *A=copyTripleArray2C(P,true,4); real fuzz=sqrtFuzz*norm(A,16); b=pair(bound(A,::min,xratio,b.getx(),fuzz), @@ -2174,13 +2182,13 @@ void gen_runarray71(stack *Stack) {Stack->push<pair>(b); return;} } -#line 1827 "runarray.in" +#line 1832 "runarray.in" // pair maxratio(triplearray2 *P, pair b); void gen_runarray72(stack *Stack) { pair b=vm::pop<pair>(Stack); triplearray2 * P=vm::pop<triplearray2 *>(Stack); -#line 1828 "runarray.in" +#line 1833 "runarray.in" triple *A=copyTripleArray2C(P,true,4); real fuzz=sqrtFuzz*norm(A,16); b=pair(bound(A,::max,xratio,b.getx(),fuzz), @@ -2189,12 +2197,12 @@ void gen_runarray72(stack *Stack) {Stack->push<pair>(b); return;} } -#line 1837 "runarray.in" +#line 1842 "runarray.in" // realarray* _projection(); void gen_runarray73(stack *Stack) { -#line 1838 "runarray.in" -#ifdef HAVE_LIBGL +#line 1843 "runarray.in" +#ifdef HAVE_GL array *a=new array(14); gl::projection P=gl::camera(); size_t k=0; @@ -2230,153 +2238,153 @@ namespace trans { void gen_runarray_venv(venv &ve) { -#line 474 "runarray.in" +#line 478 "runarray.in" REGISTER_BLTIN(run::emptyArray,"emptyArray"); -#line 480 "runarray.in" +#line 484 "runarray.in" REGISTER_BLTIN(run::newDeepArray,"newDeepArray"); -#line 502 "runarray.in" +#line 506 "runarray.in" REGISTER_BLTIN(run::newInitializedArray,"newInitializedArray"); -#line 517 "runarray.in" +#line 521 "runarray.in" REGISTER_BLTIN(run::newAppendedArray,"newAppendedArray"); -#line 533 "runarray.in" +#line 537 "runarray.in" REGISTER_BLTIN(run::newDuplicateArray,"newDuplicateArray"); -#line 543 "runarray.in" +#line 547 "runarray.in" REGISTER_BLTIN(run::arrayRead,"arrayRead"); -#line 555 "runarray.in" +#line 559 "runarray.in" REGISTER_BLTIN(run::arraySliceRead,"arraySliceRead"); -#line 562 "runarray.in" +#line 566 "runarray.in" REGISTER_BLTIN(run::arraySliceReadToEnd,"arraySliceReadToEnd"); -#line 570 "runarray.in" +#line 574 "runarray.in" REGISTER_BLTIN(run::arrayArrayRead,"arrayArrayRead"); -#line 579 "runarray.in" +#line 583 "runarray.in" REGISTER_BLTIN(run::arrayWrite,"arrayWrite"); -#line 595 "runarray.in" +#line 599 "runarray.in" REGISTER_BLTIN(run::arraySliceWrite,"arraySliceWrite"); -#line 603 "runarray.in" +#line 607 "runarray.in" REGISTER_BLTIN(run::arraySliceWriteToEnd,"arraySliceWriteToEnd"); -#line 611 "runarray.in" +#line 615 "runarray.in" REGISTER_BLTIN(run::arrayLength,"arrayLength"); -#line 617 "runarray.in" +#line 621 "runarray.in" REGISTER_BLTIN(run::arrayKeys,"arrayKeys"); -#line 632 "runarray.in" +#line 636 "runarray.in" REGISTER_BLTIN(run::arrayCyclicFlag,"arrayCyclicFlag"); -#line 639 "runarray.in" +#line 643 "runarray.in" REGISTER_BLTIN(run::arraySetCyclicFlag,"arraySetCyclicFlag"); -#line 646 "runarray.in" +#line 650 "runarray.in" REGISTER_BLTIN(run::arrayInitializedHelper,"arrayInitializedHelper"); -#line 657 "runarray.in" +#line 661 "runarray.in" REGISTER_BLTIN(run::arrayInitialized,"arrayInitialized"); -#line 663 "runarray.in" +#line 667 "runarray.in" REGISTER_BLTIN(run::arrayCyclicHelper,"arrayCyclicHelper"); -#line 670 "runarray.in" +#line 674 "runarray.in" REGISTER_BLTIN(run::arrayCyclic,"arrayCyclic"); -#line 676 "runarray.in" +#line 680 "runarray.in" REGISTER_BLTIN(run::arrayPushHelper,"arrayPushHelper"); -#line 684 "runarray.in" +#line 688 "runarray.in" REGISTER_BLTIN(run::arrayPush,"arrayPush"); -#line 690 "runarray.in" +#line 694 "runarray.in" REGISTER_BLTIN(run::arrayAppendHelper,"arrayAppendHelper"); -#line 699 "runarray.in" +#line 703 "runarray.in" REGISTER_BLTIN(run::arrayAppend,"arrayAppend"); -#line 705 "runarray.in" +#line 709 "runarray.in" REGISTER_BLTIN(run::arrayPopHelper,"arrayPopHelper"); -#line 714 "runarray.in" +#line 718 "runarray.in" REGISTER_BLTIN(run::arrayPop,"arrayPop"); -#line 720 "runarray.in" +#line 724 "runarray.in" REGISTER_BLTIN(run::arrayInsertHelper,"arrayInsertHelper"); -#line 731 "runarray.in" +#line 735 "runarray.in" REGISTER_BLTIN(run::arrayInsert,"arrayInsert"); -#line 737 "runarray.in" +#line 741 "runarray.in" REGISTER_BLTIN(run::arrayDelete,"arrayDelete"); -#line 743 "runarray.in" +#line 747 "runarray.in" REGISTER_BLTIN(run::arrayAlias,"arrayAlias"); -#line 748 "runarray.in" +#line 752 "runarray.in" REGISTER_BLTIN(run::arrayIntArray,"arrayIntArray"); -#line 766 "runarray.in" +#line 770 "runarray.in" addFunc(ve, run::gen_runarray31, IntArray(), "complement", formal(IntArray(), "a", false, false), formal(primInt(), "n", false, false)); -#line 785 "runarray.in" +#line 789 "runarray.in" REGISTER_BLTIN(run::arraySequence,"arraySequence"); -#line 798 "runarray.in" +#line 802 "runarray.in" addFunc(ve, run::gen_runarray33, IntArray(), "sequence", formal(primInt(), "n", false, false)); -#line 809 "runarray.in" +#line 813 "runarray.in" REGISTER_BLTIN(run::arrayFunction,"arrayFunction"); -#line 822 "runarray.in" +#line 826 "runarray.in" REGISTER_BLTIN(run::arraySort,"arraySort"); -#line 831 "runarray.in" +#line 835 "runarray.in" addFunc(ve, run::gen_runarray36, primBoolean(), "all", formal(booleanArray(), "a", false, false)); -#line 840 "runarray.in" +#line 844 "runarray.in" addFunc(ve, run::gen_runarray37, booleanArray(), "!", formal(booleanArray(), "a", false, false)); -#line 849 "runarray.in" +#line 853 "runarray.in" addFunc(ve, run::gen_runarray38, primInt(), "sum", formal(booleanArray(), "a", false, false)); -#line 858 "runarray.in" +#line 862 "runarray.in" REGISTER_BLTIN(run::arrayCopy,"arrayCopy"); -#line 863 "runarray.in" +#line 867 "runarray.in" REGISTER_BLTIN(run::arrayConcat,"arrayConcat"); -#line 891 "runarray.in" +#line 895 "runarray.in" REGISTER_BLTIN(run::array2Copy,"array2Copy"); -#line 896 "runarray.in" +#line 900 "runarray.in" REGISTER_BLTIN(run::array3Copy,"array3Copy"); -#line 901 "runarray.in" +#line 905 "runarray.in" REGISTER_BLTIN(run::array2Transpose,"array2Transpose"); -#line 925 "runarray.in" +#line 929 "runarray.in" REGISTER_BLTIN(run::array3Transpose,"array3Transpose"); -#line 1012 "runarray.in" +#line 1016 "runarray.in" addFunc(ve, run::gen_runarray45, primInt(), "find", formal(booleanArray(), "a", false, false), formal(primInt(), "n", true, false)); -#line 1031 "runarray.in" +#line 1035 "runarray.in" REGISTER_BLTIN(run::arrayConditional,"arrayConditional"); -#line 1057 "runarray.in" +#line 1061 "runarray.in" addFunc(ve, run::gen_runarray47, realArray2(), "identity", formal(primInt(), "n", false, false)); -#line 1063 "runarray.in" +#line 1067 "runarray.in" REGISTER_BLTIN(run::diagonal,"diagonal"); -#line 1080 "runarray.in" +#line 1084 "runarray.in" addFunc(ve, run::gen_runarray49, realArray2(), "inverse", formal(realArray2(), "a", false, false)); -#line 1172 "runarray.in" +#line 1176 "runarray.in" addFunc(ve, run::gen_runarray50, realArray(), "solve", formal(realArray2(), "a", false, false), formal(realArray(), "b", false, false), formal(primBoolean(), "warn", true, false)); -#line 1223 "runarray.in" +#line 1227 "runarray.in" addFunc(ve, run::gen_runarray51, realArray2(), "solve", formal(realArray2(), "a", false, false), formal(realArray2(), "b", false, false), formal(primBoolean(), "warn", true, false)); -#line 1287 "runarray.in" +#line 1291 "runarray.in" addFunc(ve, run::gen_runarray52, primReal(), "determinant", formal(realArray2(), "a", false, false)); -#line 1303 "runarray.in" +#line 1307 "runarray.in" addFunc(ve, run::gen_runarray53, realArray(), "*", formal(realArray2(), "a", false, false), formal(realArray(), "b", false, false)); -#line 1321 "runarray.in" +#line 1325 "runarray.in" addFunc(ve, run::gen_runarray54, realArray(), "*", formal(realArray(), "a", false, false), formal(realArray2(), "b", false, false)); -#line 1349 "runarray.in" +#line 1353 "runarray.in" addFunc(ve, run::gen_runarray55, realArray2(), "*", formal(realArray2(), "a", false, false), formal(realArray2(), "b", false, false)); -#line 1384 "runarray.in" +#line 1388 "runarray.in" addFunc(ve, run::gen_runarray56, primTriple(), "*", formal(realArray2(), "t", false, false), formal(primTriple(), "v", false, false)); -#line 1389 "runarray.in" +#line 1393 "runarray.in" addFunc(ve, run::gen_runarray57, primPair(), "project", formal(primTriple(), "v", false, false), formal(realArray2(), "t", false, false)); -#line 1414 "runarray.in" +#line 1418 "runarray.in" addFunc(ve, run::gen_runarray58, primReal(), "dot", formal(realArray(), "a", false, false), formal(realArray(), "b", false, false)); -#line 1424 "runarray.in" +#line 1428 "runarray.in" addFunc(ve, run::gen_runarray59, realArray(), "tridiagonal", formal(realArray(), "a", false, false), formal(realArray(), "b", false, false), formal(realArray(), "c", false, false), formal(realArray(), "f", false, false)); -#line 1528 "runarray.in" +#line 1532 "runarray.in" addFunc(ve, run::gen_runarray60, primReal(), "newton", formal(primInt(), "iterations", true, false), formal(realRealFunction(), "f", false, false), formal(realRealFunction(), "fprime", false, false), formal(primReal(), "x", false, false), formal(primBoolean(), "verbose", true, false)); -#line 1575 "runarray.in" +#line 1579 "runarray.in" addFunc(ve, run::gen_runarray61, primReal(), "newton", formal(primInt(), "iterations", true, false), formal(realRealFunction(), "f", false, false), formal(realRealFunction(), "fprime", false, false), formal(primReal(), "x1", false, false), formal(primReal(), "x2", false, false), formal(primBoolean(), "verbose", true, false)); -#line 1657 "runarray.in" +#line 1661 "runarray.in" addFunc(ve, run::gen_runarray62, primReal(), "simpson", formal(realRealFunction(), "f", false, false), formal(primReal(), "a", false, false), formal(primReal(), "b", false, false), formal(primReal(), "acc", true, false), formal(primReal(), "dxmax", true, false)); -#line 1669 "runarray.in" - REGISTER_BLTIN(run::pairArrayFFT,"pairArrayFFT"); -#line 1699 "runarray.in" +#line 1673 "runarray.in" + addFunc(ve, run::gen_runarray63, pairArray(), "fft", formal(pairArray(), "a", false, false), formal(primInt(), "sign", true, false)); +#line 1704 "runarray.in" addFunc(ve, run::gen_runarray64, IntArray2(), "triangulate", formal(pairArray(), "z", false, false)); -#line 1734 "runarray.in" +#line 1739 "runarray.in" addFunc(ve, run::gen_runarray65, primReal(), "norm", formal(realArray(), "a", false, false)); -#line 1745 "runarray.in" +#line 1750 "runarray.in" addFunc(ve, run::gen_runarray66, primReal(), "norm", formal(realArray2(), "a", false, false)); -#line 1760 "runarray.in" +#line 1765 "runarray.in" addFunc(ve, run::gen_runarray67, primReal(), "norm", formal(tripleArray2(), "a", false, false)); -#line 1775 "runarray.in" +#line 1780 "runarray.in" addFunc(ve, run::gen_runarray68, primReal(), "change2", formal(tripleArray2(), "a", false, false)); -#line 1797 "runarray.in" +#line 1802 "runarray.in" addFunc(ve, run::gen_runarray69, primTriple(), "minbezier", formal(tripleArray2(), "p", false, false), formal(primTriple(), "b", false, false)); -#line 1807 "runarray.in" +#line 1812 "runarray.in" addFunc(ve, run::gen_runarray70, primTriple(), "maxbezier", formal(tripleArray2(), "p", false, false), formal(primTriple(), "b", false, false)); -#line 1817 "runarray.in" +#line 1822 "runarray.in" addFunc(ve, run::gen_runarray71, primPair(), "minratio", formal(tripleArray2(), "p", false, false), formal(primPair(), "b", false, false)); -#line 1827 "runarray.in" +#line 1832 "runarray.in" addFunc(ve, run::gen_runarray72, primPair(), "maxratio", formal(tripleArray2(), "p", false, false), formal(primPair(), "b", false, false)); -#line 1837 "runarray.in" +#line 1842 "runarray.in" addFunc(ve, run::gen_runarray73, realArray(), "_projection"); } |