some functions that took a "const symbol &" now take a "const ex &"

[ginac.git] / check / exam_inifcns_nstdsums.cpp

diff --git a/check/exam_inifcns_nstdsums.cpp b/check/exam_inifcns_nstdsums.cpp
index 0ad9f1a80fc1e34d08285dca689a8c852a277e1e..f6864aa5f4d7112a95bbdcdf8b642fe4977f5492 100644 (file)
--- a/check/exam_inifcns_nstdsums.cpp
+++ b/check/exam_inifcns_nstdsums.cpp
@@ -26,73 +26,91 @@
 #include <fstream>
 
 
+/*
+ * The data in the following include file has been produced by the following
+ * Mathematica (V4.1) script:
+ *
+ *
+ *    x={0.2,0.7 ,1,1.4,3.0 }
+ *    y={0,0.3,-0.8,3.0}
+ *    st = OpenAppend["exam_inifcns_nstdsums_data.raw"]
+ *    Do[
+ *      Do[
+ *        Do[Write[st, i]; Write[st,j]; Write[st,x[[k]]+I*y[[l]]];
+ *          Write[ st,N[PolyLog[i,j,x[[k]]+I*y[[l]]]]],{i,3},{j,3}], {k,5}],{l,4}]
+ *    Do[
+ *      Do[
+ *        Do[Write[st, i]; Write[st,j]; Write[st,-x[[k]]+I*y[[l]]];
+ *          Write[ st,N[PolyLog[i,j,-x[[k]]+I*y[[l]]]]],{i,3},{j,3}], {k,5}], {l,4}]
+ *    Close[st]
+ *
+ *    
+ * and postprocessed by the following shell script
+ *
+ *
+ *    #/bin/sh
+ *    IFS=$'\n'
+ *    cat exam_inifcns_nstdsums_data.raw | sed -e 's/\*\^/E/g' > exam_inifcns_nstdsums_data.raw2
+ *    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
+ *
+ *
+ */
+#include "exam_inifcns_nstdsums.h"
+
+
+// adjust this if you want to process more S(n,p,x) data
+const int MAX_NDIM = 5;
+const int MAX_PDIM = 5;
+
+// signals end of data
+const int ENDMARK = -999;
+
 struct point
 {
        ex x;
        ex res;
 };
 
-
-const int NDIM = 5;
-const int PDIM = 5;
-
 typedef vector<point> vp;
 
-vp pp[NDIM][PDIM];
+vp pp[MAX_NDIM][MAX_PDIM];
+
 
 
 static unsigned inifcns_consist_S(void)
 {
        unsigned result = 0;
        
-       ifstream in("exam_inifcns_nstdsums_data");
-
-       if (!in) {
-               clog << "exam_inifcns_nstdsums_data not readable!" << endl;
-               return 666;
-       }
-
-       string str;
        point ppbuf;
-
-       while (1) {
-               getline(in,str);
-               if (!in)
-                       break;
-               ex en(str,symbol());
-               getline(in,str);
-               if (!in)
-                       break;
-               ex ep(str,symbol());
-               getline(in,str);
-               if (!in)
-                       break;
-               ex x(str,symbol());
-               getline(in,str);
-               if (!in)
+       int i = 0;
+       while (true) {
+               ex en(data[i++],symbol());
+               if (en == ENDMARK) {
                        break;
-               ex res(str,symbol());
-
+               }
                numeric n = ex_to<numeric>(en);
+               ex ep(data[i++],symbol());
                numeric p = ex_to<numeric>(ep);
-
+               ex x(data[i++],symbol());
+               ex res(data[i++],symbol());
+               
                ppbuf.x = x;
                ppbuf.res = res;
 
                pp[n.to_int()-1][p.to_int()-1].push_back(ppbuf);
        }
-
-       in.close();
-
+       
        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++) {
-                               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)) {
@@ -115,7 +133,7 @@ static unsigned inifcns_consist_S(void)
                }
 
        }
-       cout << endl;
+//     cout << endl;
 
        return result;
 }
@@ -139,4 +157,3 @@ unsigned exam_inifcns_nstdsums(void)
        
        return result;
 }
-