- string -> const char * (compiles about 100 times faster)

- disabled output of exam_inifcns_nstdsums
- updated exams.ref

diff --git a/check/exam_inifcns_nstdsums.cpp b/check/exam_inifcns_nstdsums.cpp
index c1ebf5b587cdbedc2314fef138dc65b1ceff07ca..f6864aa5f4d7112a95bbdcdf8b642fe4977f5492 100644 (file)
--- a/check/exam_inifcns_nstdsums.cpp
+++ b/check/exam_inifcns_nstdsums.cpp
@@ -51,7 +51,7 @@
  *    #/bin/sh
  *    IFS=$'\n'
  *    cat exam_inifcns_nstdsums_data.raw | sed -e 's/\*\^/E/g' > exam_inifcns_nstdsums_data.raw2
  *    #/bin/sh
  *    IFS=$'\n'
  *    cat exam_inifcns_nstdsums_data.raw | sed -e 's/\*\^/E/g' > exam_inifcns_nstdsums_data.raw2

- *    echo 'string data[] = {' > exam_inifcns_nstdsums_data.raw3
+ *    echo 'const char *data[] = {' > exam_inifcns_nstdsums_data.raw3

  *    for i in `cat exam_inifcns_nstdsums_data.raw2`; do echo \"$i\",; done >> exam_inifcns_nstdsums_data.raw3
  *    echo '"-999"};' >> exam_inifcns_nstdsums.h
  *
  *    for i in `cat exam_inifcns_nstdsums_data.raw2`; do echo \"$i\",; done >> exam_inifcns_nstdsums_data.raw3
  *    echo '"-999"};' >> exam_inifcns_nstdsums.h
  *


@@ -105,12 +105,12 @@ static unsigned inifcns_consist_S(void)
        vp::iterator it;
        int error = 0;
 
        vp::iterator it;
        int error = 0;
 

-       cout << endl << "Calculating ";
+//     cout << endl << "Calculating ";

        for (int sum=2; sum<=3; sum++) {
                for (int nn=1; nn<sum; nn++) {
                        vp& da = pp[nn-1][sum-nn-1];
                        for (it = da.begin(); it!=da.end(); it++) {
        for (int sum=2; sum<=3; sum++) {
                for (int nn=1; nn<sum; nn++) {
                        vp& da = pp[nn-1][sum-nn-1];
                        for (it = da.begin(); it!=da.end(); it++) {

-                               cout << "S(" << nn << "," << sum-nn << "," << it->x << ") " << flush;
+//                             cout << "S(" << nn << "," << sum-nn << "," << it->x << ") " << flush;

                                ex res = S(nn,sum-nn,it->x).evalf();
                                if (!is_a<numeric>(res)) {
                                        if ((it->x != -1) || ((sum-nn) == 1)) {
                                ex res = S(nn,sum-nn,it->x).evalf();
                                if (!is_a<numeric>(res)) {
                                        if ((it->x != -1) || ((sum-nn) == 1)) {


@@ -133,7 +133,7 @@ static unsigned inifcns_consist_S(void)
                }
 
        }
                }
 
        }

-       cout << endl;
+//     cout << endl;

 
        return result;
 }
 
        return result;
 }


@@ -157,4 +157,3 @@ unsigned exam_inifcns_nstdsums(void)
        
        return result;
 }
        
        return result;
 }

-

diff --git a/check/exam_inifcns_nstdsums.h b/check/exam_inifcns_nstdsums.h
index c45aaec30dec6ceaa5520c743f504f16cfde4406..63765048d0cea892a959defadc4ba7d08b35b296 100644 (file)
--- a/check/exam_inifcns_nstdsums.h
+++ b/check/exam_inifcns_nstdsums.h
@@ -1,4 +1,4 @@
-string data[] = {
+const char *data[] = {

 "1",
 "1",
 "0.2",
 "1",
 "1",
 "0.2",

diff --git a/check/exams.ref b/check/exams.ref
index e5423dcbb8ec541b0c98853d6698743b7710acae..e83d40914c58f67cb86f74e112efa67ef7ae2e9a 100644 (file)
--- a/check/exams.ref
+++ b/check/exams.ref
@@ -6,6 +6,8 @@
 (no output)
 ----------consistency of symbolic functions:
 (no output)
 (no output)
 ----------consistency of symbolic functions:
 (no output)

+----------consistency of nestedsums functions:
+(no output)

 ----------symbolic differentiation:
 (no output)
 ----------polynomial GCD computation:
 ----------symbolic differentiation:
 (no output)
 ----------polynomial GCD computation: