From dd0a7c193ef16df74ec9d40f4d87d5ec45620f3e Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (laptop)" <j.wuttke@fz-juelich.de>
Date: Wed, 24 Dec 2008 15:20:04 +0100
Subject: [PATCH] =?UTF-8?q?folgenlose=20Kosmetik=20(Versuch,=20*.h-Abh?=
=?UTF-8?q?=C3=A4ngigkeiten=20zu=20reduzieren)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/curve.cpp | 3 +-
src/edif.cpp | 2 +
src/expr.cpp | 1 +
src/file_io.cpp | 1 +
src/frida2.cpp | 7 +-
src/func.cpp | 1 +
src/index.cpp | 7 -
src/index.h | 1 -
src/manip.cpp | 2 +
src/olm.cpp | 1 +
src/olm.h | 2 -
src/opr.cpp | 1 +
src/r-temp.cpp | 1 +
src/rssm.cpp | 1 +
src/special1.cpp | 191 ----------------------
src/t | 411 +++++++++++++++++++++++++++++++++++++++++++++++
16 files changed, 426 insertions(+), 207 deletions(-)
delete mode 100644 src/special1.cpp
create mode 100644 src/t
diff --git a/src/curve.cpp b/src/curve.cpp
index 5d1ef84e..f9116cf9 100644
--- a/src/curve.cpp
+++ b/src/curve.cpp
@@ -12,6 +12,7 @@
#include <vector>
#include <algorithm>
+#include "mystd.h"
#include "olm.h" // includes also curve.h
#include "readln.h"
#include "asi.h"
@@ -257,7 +258,7 @@ void NCurveFile::SetFixed(string how)
void NCurveFile::SetConvolution( bool onoff )
{
- static uint kdef;
+ static uint kdef=-1;
uint k;
if( onoff ){
kdef = iask( "convolute with file", kdef );
diff --git a/src/edif.cpp b/src/edif.cpp
index 939a7c55..9e3f8a8a 100644
--- a/src/edif.cpp
+++ b/src/edif.cpp
@@ -11,11 +11,13 @@
#include <vector>
#include <algorithm>
+#include "mystd.h"
#include "olm.h"
#include "asi.h"
#include "gar.h"
#include "edif.h"
#include "dualplot.h"
+#include "index.h"
using namespace std;
diff --git a/src/expr.cpp b/src/expr.cpp
index add5493e..a6a20813 100644
--- a/src/expr.cpp
+++ b/src/expr.cpp
@@ -9,6 +9,7 @@
#include <ctype.h>
#include <math.h>
+#include "mystd.h"
#include "olm.h" // for cross-references
bool debug = false;
diff --git a/src/file_io.cpp b/src/file_io.cpp
index d3f40fc3..c07ed1b0 100644
--- a/src/file_io.cpp
+++ b/src/file_io.cpp
@@ -12,6 +12,7 @@
#include <vector>
#include <map>
+#include "mystd.h"
#include "olm.h"
#include "asi.h"
#include "gar.h"
diff --git a/src/frida2.cpp b/src/frida2.cpp
index 051cbe17..56504129 100644
--- a/src/frida2.cpp
+++ b/src/frida2.cpp
@@ -9,6 +9,7 @@
#include <string.h>
#include <stdlib.h>
#include <signal.h>
+#include "mystd.h"
#include "olm.h"
#include "asi.h"
#include "readln.h"
@@ -551,8 +552,7 @@ int main()
} else if (cmd == "_") {
cout << "Special programs\n"
"_fc cosine Fourier transform\n"
- "_ps power spectrum\n"
- "_as alefeld-schelten\n";
+ "_ps power spectrum\n";
// } else if (cmd == "_ps") {
// NFFT::PowerSpectrum();
@@ -560,9 +560,6 @@ int main()
} else if (cmd == "_fc") {
NSpecial::FourierCosine();
- } else if (cmd == "_as") {
- NSpecial::SimulateRssm();
-
} else if ( cmd == "qui" || cmd=="quit" ) {
NPlot::Close();
exit(0);
diff --git a/src/func.cpp b/src/func.cpp
index b5cfa43c..4fa58c84 100644
--- a/src/func.cpp
+++ b/src/func.cpp
@@ -13,6 +13,7 @@
#include "gsl/gsl_sf.h"
#include "rng.h"
+#include "mystd.h"
#include "olm.h" // for func_data_, comes with many includes
#include "asi.h" // for find
diff --git a/src/index.cpp b/src/index.cpp
index 36ff0504..bd37e52b 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -79,13 +79,6 @@ IndexList IndexList::sort(void)
return *this;
}
-IndexList IndexList::backsort(void)
-{
- sort();
- reverse();
- return *this;
-}
-
IndexList IndexList::complement(const IndexList Vec2,
const uint v0, const uint vn)
{
diff --git a/src/index.h b/src/index.h
index b3fd03a5..178f2b57 100644
--- a/src/index.h
+++ b/src/index.h
@@ -23,7 +23,6 @@ class IndexList { // unsorted
IndexList clear(void);
IndexList reverse(void);
IndexList sort(void);
- IndexList backsort(void);
IndexList complement(const IndexList Vec2,
const uint v0, const uint vn);
diff --git a/src/manip.cpp b/src/manip.cpp
index 1c1c6e4c..e2164661 100644
--- a/src/manip.cpp
+++ b/src/manip.cpp
@@ -14,11 +14,13 @@
#include <algorithm>
#include <gsl/gsl_sort.h>
+#include "mystd.h"
#include "olm.h"
#include "asi.h"
#include "manip.h"
#include "edif.h" // wg. ListZ()
#include "xax.h"
+#include "index.h"
using namespace std;
diff --git a/src/olm.cpp b/src/olm.cpp
index 478af83e..04a083c3 100644
--- a/src/olm.cpp
+++ b/src/olm.cpp
@@ -14,6 +14,7 @@
#include <algorithm>
using namespace std;
+#include "mystd.h"
#include "olm.h"
int err;
diff --git a/src/olm.h b/src/olm.h
index 81b3457c..db7f37f5 100644
--- a/src/olm.h
+++ b/src/olm.h
@@ -1,6 +1,4 @@
-#include "mystd.h"
#include "range.h"
-#include "index.h"
#include "list.h"
#include "coord.h"
#include "scan.h"
diff --git a/src/opr.cpp b/src/opr.cpp
index 4f41b4a1..0d9957fa 100644
--- a/src/opr.cpp
+++ b/src/opr.cpp
@@ -11,6 +11,7 @@
#include <vector>
using namespace std;
+#include "mystd.h"
#include "olm.h"
#include "gar.h"
#include "asi.h"
diff --git a/src/r-temp.cpp b/src/r-temp.cpp
index 1810472c..36a88b22 100644
--- a/src/r-temp.cpp
+++ b/src/r-temp.cpp
@@ -5,6 +5,7 @@
#include <vector>
#include <algorithm>
+#include "mystd.h"
#include "olm.h"
#include "asi.h"
#include "gar.h"
diff --git a/src/rssm.cpp b/src/rssm.cpp
index b9681b8d..ac14ff54 100644
--- a/src/rssm.cpp
+++ b/src/rssm.cpp
@@ -16,6 +16,7 @@
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
+#include "mystd.h"
#include "olm.h"
#include "asi.h"
#include "gar.h"
diff --git a/src/special1.cpp b/src/special1.cpp
deleted file mode 100644
index a033a251..00000000
--- a/src/special1.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-#include <stdlib.h>
-#include <math.h>
-#include <string>
-#include <vector>
-using namespace std;
-#include "olm.h"
-#include "rng.h"
-#include "asi.h"
-#include "readln.h"
-#include "special.h"
-
-const double twopi = 8*atan(1.);
-const double m_over_hbar = 1.587e-3; // s/m * A-1
-const double k0 = 1.00195, kPG = 0.9364995; // A-1
-const double ch_cos = kPG/k0, ch_sin = sqrt( 1-SQR(ch_cos) );
-
-namespace NSpecial {
-};
-
-
-class SimulOut{
-public:
- SimulOut( const double x, const double y, const double dE );
- double afx, afy, afz, kfE, // angle and energy in final-beam system
- bfx, bfy, bfz, // angle in fixed-chopper system
- count;
-};
-
-SimulOut::SimulOut( const double x, const double y, const double dE )
-{
- afx = sin(x);
- afy = sin(y);
- afz = sqrt( 1 - SQR(afx) - SQR(afy) );
- bfx = -afx*ch_cos + afz*ch_sin;
- bfz = -afx*ch_sin - afz*ch_cos;
- bfy = afy;
- kfE = k0+dE;
- count = 0;
-}
-
-void NSpecial::SimulateRssm(void)
-{
-
- // Ask for parameters:
- static int nMC = 100;
- static int nL = 1000;
- static int mosa[3] = {300,300,300};
- static double vel = 0;
- static double sx = 0.09;
- static double sy = 0.03;
- static double dx = 0.03;
- static double dy = 0.03;
- static int nV = 1;
- static int nX = 20;
- static double wX = 0.2;
- static int nY = 2;
- static double wY = 0.1;
- do{
- nMC = iask( "# Monte-Carlo steps", nMC );
- nL = iask( "# mosaic layers", nL );
- vel = dask( "chopper speed", vel );
- mosa[0] = iask( "mosaic size in x", mosa[0] );
- mosa[1] = iask( "mosaic size in y", mosa[1] );
- mosa[2] = iask( "mosaic size in z", mosa[2] );
- sx = dask( "mosaic spread in x", sx );
- sy = dask( "mosaic spread in y", sy );
- dx = dask( "incoming divergence in x", dx );
- dy = dask( "incoming divergence in y", dy );
- // nV = iask( "# velocities", nV );
- nX = iask( "# outgoing x angles", nX );
- wX = dask( "outgoing x angle spread", wX );
- nY = iask( "# outgoing y angles", nY );
- wY = dask( "outgoing y angle spread", wY );
- } while( !iask( "ok", 1 ) );
- double kv = m_over_hbar * vel;
- printf( "kv = %f\n", kv );
-
- // Provisionally hard-coded parameters:
- int debug = 1;
- double cX=0.0, cE=0.0;
-
- // Prepare recipient array:
- COld olf;
- olf.RPar.push_back( CParam( "totMC", "", nMC*nL ) );
- olf.RPar.push_back( CParam( "mosa-x", "", mosa[0] ) );
- olf.RPar.push_back( CParam( "mosa-y", "", mosa[1] ) );
- olf.RPar.push_back( CParam( "mosa-z", "", mosa[2] ) );
- olf.RPar.push_back( CParam( "diverg-x", "", sx ) );
- olf.RPar.push_back( CParam( "diverg-y", "", sy ) );
- olf.RPar.push_back( CParam( "speed", "m/s", vel ) );
- static CCoord xco, yco;
- olf.name = "simul";
- olf.xco = CCoord("kfx", "");
- olf.yco = CCoord("cnts", "");
-// olf.ZCo.push_back(CCoord("vel", ""));
- olf.ZCo.push_back(CCoord("kfx", ""));
- vector<SimulOut> kf;
- for( int jY=0; jY<nY; ++jY ){
- for( int jX=0; jX<nX; ++jX ){
-// for( int jV=0; jV<nV; ++jV ){
- kf.push_back( SimulOut( nX>1 ? -wX+cX+2*wX*jX/(nX-1) : 0.0,
- nY>1 ? wY*jY/(nY-1) : 0.0,
- 0.0 ) );
-// }
- }
- }
- int nkf = kf.size();
-
- // Monte-Carlo loop:
- for( int iMC=0; iMC<nMC; ++iMC ){
- double scattered = 0;
- double wgt = 1.0/nMC/nL; // /mosa[0]/mosa[1]/mosa[2];
- for( int itau=0; itau<nL; ++itau ){
- // initialize neutron
- double aix = NRNG::uniform( -dx, dx );
- double aiy = NRNG::uniform( -dy, dy );
- double aiz = sqrt( 1 - SQR(aix) - SQR(aiy) );
- // transform into chopper frame
- double bix = aix*ch_cos + aiz*ch_sin;
- double biz = -aix*ch_sin + aiz*ch_cos;
- double biy = aiy;
- // track neutron through mosaic layers
- double tx = 2*kPG*sx*NRNG::gaussian( 1.0, 4.0 );
- double ty = 2*kPG*sy*NRNG::gaussian( 1.0, 4.0 );
- double tz = sqrt( SQR(2*kPG) - tx*tx - ty*ty );
- for( int ikf=0; ikf<nkf; ++ikf ){
- SimulOut *out = &(kf[ikf]);
- double kiE = -bix*kv +
- sqrt( SQR(bix*kv) + SQR(out->kfE) + 2*out->bfx*kv );
- double trans = 1;
- double qa[3];
- qa[0] = (kiE*bix - out->kfE*out->bfx) - tx;
- qa[1] = (kiE*biy - out->kfE*out->bfy) - ty;
- qa[2] = (kiE*biz - out->kfE*out->bfz) - tz;
- printf( "%3i %12.7f %12.7f %12.7f %12.7f %12.7f %12.7f\n",
- ikf,
- kiE*bix - out->kfE*out->bfx,
- kiE*biy - out->kfE*out->bfy,
- kiE*biz - out->kfE*out->bfz,
- tx, ty, tz );
- for( int ia=0; ia<3; ++ia ){
- double arg = mosa[ia]*qa[ia];
- trans *= mosa[ia] *
- ( fabs(arg)<1.e-20 ? 1.0 : SQR( sin( arg ) / arg ) );
- }
- out->count += wgt*trans;
- scattered += wgt*trans;
- }
- }
- printf( "%4i scattered %9.6g\n", iMC, scattered );
- }
-
- // Save position-dependent intensities:
- for( int j=0; j<nY; ++j ){
- CScan S;
- S.z.push_back( kf[j*nX].afy );
- for( int i=0; i<nX; ++i ){
- int ikf = j*nX+i;
- SimulOut *out = &(kf[ikf]);
- S.push_back( out->afx, out->count );
- }
- olf.VS.push_back( S );
- }
- NOlm::SelNew();
- NOlm::OloAdd(&olf);
-}
-
-void altlast()
-{
- // Read tau values:
- /*
- string fnam = "/home/jwu/rs/mosaic/tau0.xy";
- FILE *ft;
- if( !(ft = fopen( fnam.c_str(), "r" ) ) ){
- printf( "cannot open %s\n", ft );
- }
- vector<double> taux, tauy, tauz;
- double tx, ty, tz;
- while( !( fscanf( ft, "%lf %lf\n", &tx, &ty )==EOF ) ){
- tx *= sx;
- ty *= sy;
- tz = sqrt( 1 - tx*tx - ty*ty );
- taux.push_back( amp*tx );
- tauy.push_back( amp*ty );
- tauz.push_back( amp*tz );
- }
- fclose( ft );
- int ntau = taux.size();
- printf( "read %i mosaic orientations\n", ntau );
- */
-}
diff --git a/src/t b/src/t
new file mode 100644
index 00000000..b7c95e7a
--- /dev/null
+++ b/src/t
@@ -0,0 +1,411 @@
+In file included from range.h:11,
+ from olm.h:1,
+ from curve.cpp:15:
+range.h.tpl:14: error: expected ‘,’ or ‘...’ before ‘&’ token
+range.h.tpl:14: error: ISO C++ forbids declaration of ‘string’ with no type
+range.h.tpl:14: error: ‘CRange::CRange(int)’ cannot be overloaded
+range.h.tpl:10: error: with ‘CRange::CRange(int)’
+range.h.tpl:45: error: ‘string’ does not name a type
+range.h.tpl:48: error: ISO C++ forbids declaration of ‘ostream’ with no type
+range.h.tpl:48: error: ‘ostream’ is neither function nor member function; cannot be declared friend
+range.h.tpl:48: error: expected ‘;’ before ‘&’ token
+range.h.tpl: In member function ‘const char* CRange::c_str() const’:
+range.h.tpl:47: error: ‘str’ was not declared in this scope
+range.h.tpl: At global scope:
+range.h.tpl:54: error: ‘string’ does not name a type
+In file included from range.h:21,
+ from olm.h:1,
+ from curve.cpp:15:
+range.h.tpl:14: error: expected ‘,’ or ‘...’ before ‘&’ token
+range.h.tpl:14: error: ISO C++ forbids declaration of ‘string’ with no type
+range.h.tpl:14: error: ‘CLimits::CLimits(int)’ cannot be overloaded
+range.h.tpl:10: error: with ‘CLimits::CLimits(int)’
+range.h.tpl:45: error: ‘string’ does not name a type
+range.h.tpl:48: error: ISO C++ forbids declaration of ‘ostream’ with no type
+range.h.tpl:48: error: ‘ostream’ is neither function nor member function; cannot be declared friend
+range.h.tpl:48: error: expected ‘;’ before ‘&’ token
+range.h.tpl: In member function ‘const char* CLimits::c_str() const’:
+range.h.tpl:47: error: ‘str’ was not declared in this scope
+range.h.tpl: At global scope:
+range.h.tpl:54: error: ‘string’ does not name a type
+In file included from olm.h:2,
+ from curve.cpp:15:
+list.h:10: error: ‘string’ does not name a type
+list.h:13: error: ISO C++ forbids declaration of ‘vector’ with no type
+list.h:13: error: expected ‘;’ before ‘<’ token
+list.h:16: error: expected `)' before ‘inp’
+list.h:17: error: expected `)' before ‘inp’
+list.h:50: error: ‘string’ does not name a type
+list.h:53: error: ISO C++ forbids declaration of ‘ostream’ with no type
+list.h:53: error: ‘ostream’ is neither function nor member function; cannot be declared friend
+list.h:53: error: ‘ostream’ declared as an ‘inline’ field
+list.h:53: error: expected ‘;’ before ‘&’ token
+list.h:59: error: ‘string’ has not been declared
+list.h:60: error: ‘string’ has not been declared
+list.h:61: error: ‘string’ has not been declared
+list.h:62: error: ‘string’ has not been declared
+list.h:63: error: ‘string’ has not been declared
+list.h:64: error: ‘string’ has not been declared
+list.h:66: error: ‘string’ does not name a type
+list.h: In member function ‘uint CList::n() const’:
+list.h:28: error: ‘V’ was not declared in this scope
+list.h: In member function ‘const char* CList::c_str() const’:
+list.h:52: error: ‘str’ was not declared in this scope
+list.h: At global scope:
+list.h:71: error: ‘string’ does not name a type
+list.h: In constructor ‘ListIter::ListIter()’:
+list.h:79: error: no matching function for call to ‘CList::CList()’
+list.h:23: note: candidates are: CList::CList(CLimits)
+list.h:22: note: CList::CList(uint, uint)
+list.h:21: note: CList::CList(uint)
+list.h:6: note: CList::CList(const CList&)
+list.h: In constructor ‘ListIter::ListIter(CList)’:
+list.h:80: error: no matching function for call to ‘CList::CList()’
+list.h:23: note: candidates are: CList::CList(CLimits)
+list.h:22: note: CList::CList(uint, uint)
+list.h:21: note: CList::CList(uint)
+list.h:6: note: CList::CList(const CList&)
+list.h: In member function ‘uint ListIter::operator()(uint*)’:
+list.h:85: error: ‘class CList’ has no member named ‘V’
+In file included from olm.h:3,
+ from curve.cpp:15:
+coord.h: At global scope:
+coord.h:7: error: ‘string’ does not name a type
+coord.h:11: error: expected ‘,’ or ‘...’ before ‘*’ token
+coord.h:11: error: ISO C++ forbids declaration of ‘string’ with no type
+coord.h:12: error: expected ‘,’ or ‘...’ before ‘nin’
+coord.h:12: error: ISO C++ forbids declaration of ‘string’ with no type
+coord.h:12: error: ‘CCoord::CCoord(int)’ cannot be overloaded
+coord.h:11: error: with ‘CCoord::CCoord(int)’
+coord.h:17: error: ISO C++ forbids declaration of ‘ostream’ with no type
+coord.h:17: error: ‘ostream’ is neither function nor member function; cannot be declared friend
+coord.h:17: error: expected ‘;’ before ‘&’ token
+coord.h:18: error: ‘string’ does not name a type
+coord.h:19: error: ‘string’ does not name a type
+coord.h:20: error: ‘string’ does not name a type
+coord.h:22: error: ‘string’ does not name a type
+coord.h: In member function ‘bool CCoord::defined()’:
+coord.h:21: error: ‘name’ was not declared in this scope
+coord.h: In member function ‘bool CCoord::operator==(const CCoord&) const’:
+coord.h:25: error: ‘name’ was not declared in this scope
+coord.h:25: error: ‘const class CCoord’ has no member named ‘name’
+coord.h:25: error: ‘unit’ was not declared in this scope
+coord.h:25: error: ‘const class CCoord’ has no member named ‘unit’
+coord.h: At global scope:
+coord.h:33: error: ‘string’ does not name a type
+coord.h:42: error: expected `)' before ‘nin’
+coord.h:45: error: ‘string’ does not name a type
+coord.h:46: error: expected ‘,’ or ‘...’ before ‘in’
+coord.h:46: error: ISO C++ forbids declaration of ‘string’ with no type
+In file included from olm.h:4,
+ from curve.cpp:15:
+scan.h:4: error: ISO C++ forbids declaration of ‘vector’ with no type
+scan.h:4: error: expected ‘;’ before ‘<’ token
+scan.h:5: error: ISO C++ forbids declaration of ‘vector’ with no type
+scan.h:5: error: expected ‘;’ before ‘<’ token
+scan.h:8: error: expected ‘,’ or ‘...’ before ‘<’ token
+scan.h:9: error: ISO C++ forbids declaration of ‘vector’ with no type
+scan.h:23: error: ‘string’ has not been declared
+In file included from olm.h:5,
+ from curve.cpp:15:
+curve.h:9: error: ISO C++ forbids declaration of ‘vector’ with no type
+curve.h:9: error: expected ‘;’ before ‘<’ token
+curve.h:10: error: ISO C++ forbids declaration of ‘vector’ with no type
+curve.h:10: error: expected ‘;’ before ‘<’ token
+curve.h:26: error: variable or field ‘SetProperties’ declared void
+curve.h:26: error: ‘string’ was not declared in this scope
+curve.h:29: error: variable or field ‘OprPar’ declared void
+curve.h:29: error: ‘string’ was not declared in this scope
+curve.h:30: error: variable or field ‘SetFixed’ declared void
+curve.h:30: error: ‘string’ was not declared in this scope
+curve.h:32: error: variable or field ‘SetFitTuningPars’ declared void
+curve.h:32: error: ‘string’ was not declared in this scope
+curve.h:35: error: variable or field ‘SetIntTuningPars’ declared void
+curve.h:35: error: ‘string’ was not declared in this scope
+In file included from olm.h:6,
+ from curve.cpp:15:
+func.h:4: error: ‘vector’ has not been declared
+func.h:4: error: expected ‘,’ or ‘...’ before ‘<’ token
+func.h:8: error: ‘string’ does not name a type
+func.h:18: error: expected `)' before ‘name_in’
+func.h:24: error: expected `)' before ‘name_in’
+func.h:30: error: expected `)' before ‘name_in’
+func.h:36: error: expected `)' before ‘name_in’
+func.h:46: error: ‘string’ was not declared in this scope
+func.h:106: error: ‘vector’ has not been declared
+func.h:106: error: expected ‘,’ or ‘...’ before ‘<’ token
+In file included from olm.h:7,
+ from curve.cpp:15:
+expr.h:21: error: ISO C++ forbids declaration of ‘vector’ with no type
+expr.h:21: error: expected ‘;’ before ‘<’ token
+expr.h:26: error: expected ‘,’ or ‘...’ before ‘<’ token
+expr.h:26: error: ISO C++ forbids declaration of ‘vector’ with no type
+expr.h:28: error: expected ‘,’ or ‘...’ before ‘<’ token
+expr.h:28: error: ISO C++ forbids declaration of ‘vector’ with no type
+expr.h:26: error: default argument missing for parameter 3 of ‘CContext::CContext(uint, uint, int)’
+expr.h: In constructor ‘CContext::CContext(uint, uint, int)’:
+expr.h:27: error: class ‘CContext’ does not have any field named ‘fargs’
+expr.h:27: error: ‘fargs_’ was not declared in this scope
+expr.h: In constructor ‘CContext::CContext(int)’:
+expr.h:29: error: ‘k_’ was not declared in this scope
+expr.h:29: error: ‘j_’ was not declared in this scope
+expr.h:29: error: ‘vi_’ was not declared in this scope
+expr.h: At global scope:
+expr.h:51: error: ISO C++ forbids declaration of ‘vector’ with no type
+expr.h:51: error: expected ‘;’ before ‘<’ token
+expr.h:56: error: expected ‘,’ or ‘...’ before ‘<’ token
+expr.h:56: error: ISO C++ forbids declaration of ‘vector’ with no type
+expr.h:63: error: ‘string’ does not name a type
+expr.h: In member function ‘void CTOut::preset_vd(int)’:
+expr.h:55: error: ‘vd’ was not declared in this scope
+expr.h: In member function ‘void CTOut::set_vd(int)’:
+expr.h:56: error: ‘vd’ was not declared in this scope
+expr.h:56: error: ‘vd_’ was not declared in this scope
+expr.h: In member function ‘double CTOut::any_d(int) const’:
+expr.h:62: error: ‘vd’ was not declared in this scope
+expr.h: At global scope:
+expr.h:83: error: expected ‘,’ or ‘...’ before ‘s’
+expr.h:84: error: ISO C++ forbids declaration of ‘string’ with no type
+expr.h:120: error: ‘string’ does not name a type
+expr.h: In member function ‘const char* CRef::ref_cstr() const’:
+expr.h:122: error: ‘ref_info’ was not declared in this scope
+expr.h: At global scope:
+expr.h:128: error: expected initializer before ‘<’ token
+expr.h:178: error: ‘VCTree’ has not been declared
+expr.h:212: error: ‘vector’ has not been declared
+expr.h:212: error: expected ‘,’ or ‘...’ before ‘<’ token
+expr.h:215: error: ‘vector’ has not been declared
+expr.h:215: error: expected ‘,’ or ‘...’ before ‘<’ token
+expr.h:219: error: ‘string’ does not name a type
+expr.h: In constructor ‘CTree::CTree(const CFunc*, CTree*)’:
+expr.h:162: error: ‘string’ was not declared in this scope
+expr.h: In constructor ‘CTree::CTree(const CFunc*, CTree*, CTree*)’:
+expr.h:169: error: ‘string’ was not declared in this scope
+expr.h: In constructor ‘CTree::CTree(const CFunc*, CTree*, CTree*, CTree*)’:
+expr.h:176: error: ‘string’ was not declared in this scope
+expr.h: In constructor ‘CTree::CTree(const CFunc*, CTree*, int*)’:
+expr.h:180: error: ‘string’ was not declared in this scope
+expr.h: In constructor ‘CTree::CTree(char)’:
+expr.h:197: error: ‘string’ was not declared in this scope
+expr.h: In member function ‘const char* CTree::tree_cstr() const’:
+expr.h:221: error: ‘tree_info’ was not declared in this scope
+In file included from curve.cpp:15:
+olm.h: At global scope:
+olm.h:11: error: ‘string’ does not name a type
+olm.h:12: error: ISO C++ forbids declaration of ‘vector’ with no type
+olm.h:12: error: expected ‘;’ before ‘<’ token
+olm.h:14: error: ISO C++ forbids declaration of ‘vector’ with no type
+olm.h:14: error: expected ‘;’ before ‘<’ token
+olm.h:15: error: ISO C++ forbids declaration of ‘vector’ with no type
+olm.h:15: error: expected ‘;’ before ‘<’ token
+olm.h: In member function ‘uint COlo::nZ() const’:
+olm.h:20: error: ‘ZCo’ was not declared in this scope
+olm.h: At global scope:
+olm.h:28: error: ISO C++ forbids declaration of ‘vector’ with no type
+olm.h:28: error: expected ‘;’ before ‘<’ token
+olm.h:37: error: ‘string’ has not been declared
+olm.h: In member function ‘uint COld::nScan() const’:
+olm.h:33: error: ‘VS’ was not declared in this scope
+olm.h: At global scope:
+olm.h:42: error: ‘string’ does not name a type
+olm.h:46: error: ISO C++ forbids declaration of ‘vector’ with no type
+olm.h:46: error: expected ‘;’ before ‘<’ token
+olm.h:47: error: ISO C++ forbids declaration of ‘vector’ with no type
+olm.h:47: error: expected ‘;’ before ‘<’ token
+olm.h:48: error: ISO C++ forbids declaration of ‘vector’ with no type
+olm.h:48: error: expected ‘;’ before ‘<’ token
+olm.h:49: error: ISO C++ forbids declaration of ‘vector’ with no type
+olm.h:49: error: expected ‘;’ before ‘<’ token
+olm.h:56: error: ISO C++ forbids declaration of ‘vector’ with no type
+olm.h:56: error: expected ‘;’ before ‘<’ token
+olm.h:57: error: ‘string’ does not name a type
+olm.h: In member function ‘uint COlc::nScan() const’:
+olm.h:54: error: ‘VC’ was not declared in this scope
+olm.h: In member function ‘uint COlc::nPar() const’:
+olm.h:55: error: ‘PCo’ was not declared in this scope
+olm.h: At global scope:
+olm.h:108: error: ISO C++ forbids declaration of ‘vector’ with no type
+olm.h:108: error: expected ‘;’ before ‘<’ token
+olm.h:113: error: ‘string’ has not been declared
+olm.h:114: error: ‘string’ has not been declared
+olm.h: In member function ‘uint CEle::nPts() const’:
+olm.h:105: error: ‘class COlc’ has no member named ‘PCo’
+olm.h: At global scope:
+olm.h:120: error: expected initializer before ‘<’ token
+olm.h:137: error: variable or field ‘JSelAsk’ declared void
+olm.h:137: error: ‘string’ was not declared in this scope
+olm.h:137: error: expected primary-expression before ‘*’ token
+olm.h:137: error: ‘JSel’ was not declared in this scope
+olm.h: In constructor ‘NOlm::Iterate::Iterate()’:
+olm.h:144: error: no matching function for call to ‘CList::CList()’
+list.h:23: note: candidates are: CList::CList(CLimits)
+list.h:22: note: CList::CList(uint, uint)
+list.h:21: note: CList::CList(uint)
+list.h:6: note: CList::CList(const CList&)
+olm.h: In member function ‘void NOlm::Iterate::All()’:
+olm.h:146: error: ‘MOM’ was not declared in this scope
+olm.h: In member function ‘uint NOlm::Iterate::SelNo() const’:
+olm.h:147: error: ‘const class CList’ has no member named ‘V’
+olm.h: In member function ‘uint NOlm::Iterate::size() const’:
+olm.h:149: error: ‘const class CList’ has no member named ‘V’
+olm.h: In member function ‘CEle* NOlm::IterateEle::operator()()’:
+olm.h:155: error: ‘MOM’ was not declared in this scope
+olm.h:155: error: ‘class CList’ has no member named ‘V’
+olm.h: In member function ‘COld* NOlm::IterateD::operator()()’:
+olm.h:164: error: ‘MOM’ was not declared in this scope
+olm.h:164: error: ‘class CList’ has no member named ‘V’
+olm.h: In member function ‘COlc* NOlm::IterateC::operator()()’:
+olm.h:174: error: ‘MOM’ was not declared in this scope
+olm.h:174: error: ‘class CList’ has no member named ‘V’
+In file included from curve.cpp:16:
+readln.h: At global scope:
+readln.h:6: error: ‘string’ does not name a type
+readln.h:7: error: ‘string’ does not name a type
+readln.h:11: error: ‘string’ does not name a type
+readln.h:12: error: ‘string’ does not name a type
+readln.h:13: error: expected ‘,’ or ‘...’ before ‘in’
+readln.h:13: error: ISO C++ forbids declaration of ‘string’ with no type
+readln.h:14: error: expected ‘,’ or ‘...’ before ‘in’
+readln.h:14: error: ISO C++ forbids declaration of ‘string’ with no type
+readln.h:15: error: expected ‘,’ or ‘...’ before ‘in’
+readln.h:15: error: ISO C++ forbids declaration of ‘string’ with no type
+curve.cpp: In member function ‘void CCurve::Clear()’:
+curve.cpp:34: error: ‘P’ was not declared in this scope
+curve.cpp:35: error: ‘z’ was not declared in this scope
+curve.cpp: In function ‘void NCurveFile::Create(bool, bool)’:
+curve.cpp:86: error: ‘class COlc’ has no member named ‘PCo’
+curve.cpp:86: error: no matching function for call to ‘CCoord::CCoord(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, const char [1])’
+coord.h:11: note: candidates are: CCoord::CCoord(int)
+coord.h:10: note: CCoord::CCoord(const char*, const char*)
+coord.h:9: note: CCoord::CCoord()
+coord.h:5: note: CCoord::CCoord(const CCoord&)
+curve.cpp:87: error: ‘class COlc’ has no member named ‘PHi’
+curve.cpp:88: error: ‘class COlc’ has no member named ‘Fixed’
+curve.cpp:91: error: ‘class COlc’ has no member named ‘expr’
+curve.cpp:105: error: ‘class COlc’ has no member named ‘name’
+curve.cpp:105: error: ‘const class COld’ has no member named ‘name’
+curve.cpp:109: error: ‘class COlc’ has no member named ‘ZCo’
+curve.cpp:109: error: ‘const class COld’ has no member named ‘ZCo’
+curve.cpp:110: error: ‘class COlc’ has no member named ‘RPar’
+curve.cpp:110: error: ‘const class COld’ has no member named ‘RPar’
+curve.cpp:111: error: ‘const class COld’ has no member named ‘name’
+curve.cpp:112: error: ‘class COlc’ has no member named ‘lDoc’
+curve.cpp:115: error: ‘class CCurve’ has no member named ‘z’
+curve.cpp:115: error: ‘const class COld’ has no member named ‘VS’
+curve.cpp:116: error: ‘class CCurve’ has no member named ‘P’
+curve.cpp:117: error: ‘class COlc’ has no member named ‘VC’
+curve.cpp:124: error: ‘class COlc’ has no member named ‘name’
+curve.cpp:128: error: ‘class COlc’ has no member named ‘lDoc’
+curve.cpp:130: error: ‘class CCurve’ has no member named ‘P’
+curve.cpp:131: error: ‘class COlc’ has no member named ‘VC’
+curve.cpp: In function ‘void NCurveFile::ShowPar()’:
+curve.cpp:145: error: ‘const class COlc’ has no member named ‘pInfoCat’
+curve.cpp: At global scope:
+curve.cpp:150: error: no ‘std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > COlc::pInfo() const’ member function declared in class ‘COlc’
+curve.cpp:183: error: no ‘std::string COlc::pInfoCat() const’ member function declared in class ‘COlc’
+curve.cpp:194: error: ‘void NCurveFile::OprPar(std::string)’ should have been declared inside ‘NCurveFile’
+curve.cpp: In function ‘void NCurveFile::OprPar(std::string)’:
+curve.cpp:196: error: no matching function for call to ‘CRef::CRef(std::string&)’
+expr.h:90: note: candidates are: CRef::CRef(const CRef&)
+expr.h:84: note: CRef::CRef(int)
+curve.cpp:216: error: ‘class COlc’ has no member named ‘VC’
+curve.cpp: At global scope:
+curve.cpp:224: error: ‘void NCurveFile::SetFixed(std::string)’ should have been declared inside ‘NCurveFile’
+curve.cpp: In function ‘void NCurveFile::SetFixed(std::string)’:
+curve.cpp:243: error: no matching function for call to ‘CList::CList()’
+list.h:23: note: candidates are: CList::CList(CLimits)
+list.h:22: note: CList::CList(uint, uint)
+list.h:21: note: CList::CList(uint)
+list.h:6: note: CList::CList(const CList&)
+curve.cpp:246: error: ‘class COlc’ has no member named ‘Fixed’
+curve.cpp:246: error: ‘class CList’ has no member named ‘V’
+curve.cpp: At global scope:
+curve.cpp:276: error: ‘void NCurveFile::SetProperties(std::string)’ should have been declared inside ‘NCurveFile’
+curve.cpp: In function ‘void globalEvaluate(double*, int, double*, void*, int*)’:
+curve.cpp:323: error: ‘class COlc’ has no member named ‘VC’
+curve.cpp:327: error: ‘class COlc’ has no member named ‘Fixed’
+curve.cpp:328: error: ‘class CCurve’ has no member named ‘P’
+curve.cpp:330: error: ‘const class COld’ has no member named ‘VS’
+curve.cpp:332: error: ‘const class CScan’ has no member named ‘x’
+curve.cpp:336: error: ‘const class CScan’ has no member named ‘y’
+curve.cpp:338: error: ‘const class CScan’ has no member named ‘y’
+curve.cpp:341: error: ‘const class CScan’ has no member named ‘y’
+curve.cpp: At global scope:
+curve.cpp:373: error: ‘void NCurveFile::SetFitTuningPars(std::string)’ should have been declared inside ‘NCurveFile’
+curve.cpp: In function ‘void NCurveFile::Fit()’:
+curve.cpp:422: error: ‘MOM’ is not a member of ‘NOlm’
+curve.cpp:425: error: ‘MOM’ is not a member of ‘NOlm’
+curve.cpp:439: error: ‘class COlc’ has no member named ‘Fixed’
+curve.cpp:453: error: ‘class COld’ has no member named ‘VS’
+curve.cpp:454: error: ‘class COlc’ has no member named ‘VC’
+curve.cpp:457: error: ‘class COlc’ has no member named ‘Fixed’
+curve.cpp:458: error: ‘class CCurve’ has no member named ‘P’
+curve.cpp:477: error: ‘class CScan’ has no member named ‘y’
+curve.cpp:478: error: ‘class CScan’ has no member named ‘y’
+curve.cpp:478: error: ‘class CScan’ has no member named ‘y’
+curve.cpp:492: error: ‘class COlc’ has no member named ‘Fixed’
+curve.cpp:493: error: ‘class COlc’ has no member named ‘PHi’
+curve.cpp:494: error: ‘class COld’ has no member named ‘name’
+curve.cpp: In function ‘double myeval(double, void*)’:
+curve.cpp:520: error: no matching function for call to ‘CTree::tree_curve_val(std::vector<double, std::allocator<double> >*, std::vector<double, std::allocator<double> >&, unsigned int&, unsigned int&, const uint&) const’
+expr.h:216: note: candidates are: void CTree::tree_curve_val(int) const
+curve.cpp: At global scope:
+curve.cpp:545: error: ‘void NCurveFile::SetIntTuningPars(std::string)’ should have been declared inside ‘NCurveFile’
+curve.cpp: In function ‘void NCurveFile::Integrate()’:
+curve.cpp:592: error: ‘const class COlc’ has no member named ‘ZCo’
+curve.cpp:599: error: no matching function for call to ‘CList::CList(std::string&, CLimits)’
+list.h:23: note: candidates are: CList::CList(CLimits)
+list.h:22: note: CList::CList(uint, uint)
+list.h:21: note: CList::CList(uint)
+list.h:6: note: CList::CList(const CList&)
+curve.cpp:601: error: ‘class CList’ has no member named ‘V’
+curve.cpp:603: error: ‘const class COlc’ has no member named ‘PCo’
+curve.cpp: In function ‘void NCurveFile::IntegrateFile(const COlc*, int, const std::string&, int, const std::string&, const CCoord&)’:
+curve.cpp:621: error: ‘const class COlc’ has no member named ‘ZCo’
+curve.cpp:626: error: ‘class COld’ has no member named ‘name’
+curve.cpp:627: error: ‘class COld’ has no member named ‘name’
+curve.cpp:628: error: ‘class COld’ has no member named ‘name’
+curve.cpp:629: error: ‘const class COlc’ has no member named ‘ZCo’
+curve.cpp:631: error: ‘class COld’ has no member named ‘ZCo’
+curve.cpp:633: error: ‘class COld’ has no member named ‘ZCo’
+curve.cpp:634: error: ‘class COld’ has no member named ‘lDoc’
+curve.cpp:636: error: ‘class CScan’ has no member named ‘z’
+curve.cpp:636: error: ‘const class COlc’ has no member named ‘VC’
+curve.cpp:637: error: ‘class CScan’ has no member named ‘z’
+curve.cpp:645: error: ‘const class COlc’ has no member named ‘VC’
+curve.cpp:647: error: ‘const class COlc’ has no member named ‘VC’
+curve.cpp:649: error: ‘const class COlc’ has no member named ‘VC’
+curve.cpp:651: error: ‘const class COlc’ has no member named ‘VC’
+curve.cpp:653: error: ‘const class COlc’ has no member named ‘VC’
+curve.cpp:660: error: ‘const class COlc’ has no member named ‘name’
+curve.cpp:665: error: ‘const class COlc’ has no member named ‘VC’
+curve.cpp:669: error: ‘const class COlc’ has no member named ‘VC’
+curve.cpp:669: error: ‘const class COlc’ has no member named ‘VC’
+curve.cpp:670: error: ‘class COld’ has no member named ‘VS’
+curve.cpp:672: error: ‘class CScan’ has no member named ‘z’
+curve.cpp:672: error: ‘const class COlc’ has no member named ‘VC’
+curve.cpp:673: error: ‘class CScan’ has no member named ‘z’
+curve.cpp:677: error: ‘class COld’ has no member named ‘VS’
+curve.cpp: In function ‘void NCurveFile::CumulativeDistribution()’:
+curve.cpp:799: error: ‘class COld’ has no member named ‘name’
+curve.cpp:799: error: ‘const class COlc’ has no member named ‘name’
+curve.cpp:802: error: ‘class COld’ has no member named ‘ZCo’
+curve.cpp:802: error: ‘const class COlc’ has no member named ‘ZCo’
+curve.cpp:803: error: ‘class COld’ has no member named ‘lDoc’
+curve.cpp:803: error: ‘const class COlc’ has no member named ‘lDoc’
+curve.cpp:804: error: ‘class COld’ has no member named ‘lDoc’
+curve.cpp:806: error: ‘const class COlc’ has no member named ‘VC’
+curve.cpp:807: error: ‘const class COlc’ has no member named ‘VC’
+curve.cpp:809: error: ‘class CScan’ has no member named ‘z’
+curve.cpp:809: error: ‘const class CCurve’ has no member named ‘z’
+curve.cpp:810: error: ‘class CScan’ has no member named ‘x’
+curve.cpp:812: error: ‘class CScan’ has no member named ‘x’
+curve.cpp:813: error: ‘class CScan’ has no member named ‘y’
+curve.cpp:814: error: ‘class CScan’ has no member named ‘y’
+curve.cpp:815: error: ‘class CScan’ has no member named ‘y’
+curve.cpp:822: error: ‘class CScan’ has no member named ‘y’
+curve.cpp:824: error: ‘class COld’ has no member named ‘VS’
+curve.cpp: In function ‘double IntervalDifference(double, void*)’:
+curve.cpp:843: error: ‘const class COlc’ has no member named ‘VC’
+curve.cpp:845: error: ‘const class COlc’ has no member named ‘VC’
+make: *** [obj/curve.o] Error 1
--
GitLab