Menu
▾
▴
[Csp-commits] APPLICATIONS/SimData/Source InterfaceRegistry.cpp,1.1.2.1,1.1.2.2 Interpolate.cpp,1.1.2.1,1.1.2.2 Path.cpp,1.1.2.1,1.1.2.2 TypeAdapter.cpp,1.1.2.1,1.1.2.2 cSimData_wrap.cpp,1.1.2.1,1.1.2.2
Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv18665/Source
Modified Files:
Tag: simdata
InterfaceRegistry.cpp Interpolate.cpp Path.cpp TypeAdapter.cpp
cSimData_wrap.cpp
Log Message:
wide range of small fixes
Index: InterfaceRegistry.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Attic/InterfaceRegistry.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** InterfaceRegistry.cpp 19 Jan 2003 20:31:41 -0000 1.1.2.1
--- InterfaceRegistry.cpp 20 Jan 2003 04:56:49 -0000 1.1.2.2
***************
*** 38,41 ****
--- 38,43 ----
#include <SimData/Path.h>
+ using std::cout;
+ using std::endl;
NAMESPACE_SIMDATA
Index: Interpolate.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Attic/Interpolate.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Interpolate.cpp 19 Jan 2003 20:31:41 -0000 1.1.2.1
--- Interpolate.cpp 20 Jan 2003 04:56:49 -0000 1.1.2.2
***************
*** 26,29 ****
--- 26,32 ----
+ #define min(a, b) (((a)<(b)) ? (a) : (b))
+ #define max(a, b) (((a)>(b)) ? (a) : (b))
+
const Enumeration InterpolatedData::Method("LINEAR SPLINE");
Index: Path.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Attic/Path.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Path.cpp 19 Jan 2003 20:31:41 -0000 1.1.2.1
--- Path.cpp 20 Jan 2003 04:56:49 -0000 1.1.2.2
***************
*** 23,26 ****
--- 23,28 ----
#include <SimData/ns-simdata.h>
+ using std::cout;
+ using std::endl;
NAMESPACE_SIMDATA
Index: TypeAdapter.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Attic/TypeAdapter.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** TypeAdapter.cpp 19 Jan 2003 20:31:41 -0000 1.1.2.1
--- TypeAdapter.cpp 20 Jan 2003 04:56:49 -0000 1.1.2.2
***************
*** 38,42 ****
* Convenience function for dumping object member variables.
*/
! ostream &operator <<(ostream &o, TypeAdapter const &t) {
if (t.isType(TypeAdapter::INT)) return o << (int const) t;
if (t.isType(TypeAdapter::DOUBLE)) return o << (double const) t;
--- 38,42 ----
* Convenience function for dumping object member variables.
*/
! std::ostream &operator <<(std::ostream &o, TypeAdapter const &t) {
if (t.isType(TypeAdapter::INT)) return o << (int const) t;
if (t.isType(TypeAdapter::DOUBLE)) return o << (double const) t;
Index: cSimData_wrap.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Attic/cSimData_wrap.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** cSimData_wrap.cpp 19 Jan 2003 20:31:40 -0000 1.1.2.1
--- cSimData_wrap.cpp 20 Jan 2003 04:56:49 -0000 1.1.2.2
***************
*** 692,719 ****
#define SWIGTYPE_p_simdata__PythonException swig_types[43]
#define SWIGTYPE_p_simdata__Exception swig_types[44]
! #define SWIGTYPE_p_std__ostream swig_types[45]
! #define SWIGTYPE_p_a_3__simdata__Matrix3__M_t swig_types[46]
! #define SWIGTYPE_p_simdata__Object swig_types[47]
! #define SWIGTYPE_p_simdata__Packer swig_types[48]
! #define SWIGTYPE_p_simdata__Zulu swig_types[49]
! #define SWIGTYPE_p_std__vectorTfloat_t swig_types[50]
! #define SWIGTYPE_p_simdata__Curve swig_types[51]
! #define SWIGTYPE_p_std__vectorTsimdata__Enum_t swig_types[52]
! #define SWIGTYPE_p_tm swig_types[53]
! #define SWIGTYPE_p_FILE swig_types[54]
! #define SWIGTYPE_p_int swig_types[55]
! #define SWIGTYPE_p_std__vectorTsimdata__Table_t swig_types[56]
! #define SWIGTYPE_p_std__vectorTsimdata__Curve_t swig_types[57]
! #define SWIGTYPE_p_simdata__BaseType swig_types[58]
! #define SWIGTYPE_p_simdata__ListTsimdata__Curve_t swig_types[59]
! #define SWIGTYPE_p_simdata__ListTsimdata__Table_t swig_types[60]
! #define SWIGTYPE_p_simdata__IOError swig_types[61]
! #define SWIGTYPE_p_std__vectorTsimdata__InterfaceProxy_p_t swig_types[62]
! #define SWIGTYPE_p_simdata__SimDate swig_types[63]
! #define SWIGTYPE_p_simdata__InterpolatedData swig_types[64]
! #define SWIGTYPE_p_std__vectorTstd__string_t swig_types[65]
! #define SWIGTYPE_p_simdata__Matrix3 swig_types[66]
! #define SWIGTYPE_p_simdata__InterfaceProxy swig_types[67]
! static swig_type_info *swig_types[69];
/* -------- TYPES TABLE (END) -------- */
--- 692,720 ----
#define SWIGTYPE_p_simdata__PythonException swig_types[43]
#define SWIGTYPE_p_simdata__Exception swig_types[44]
! #define SWIGTYPE_p_gint32 swig_types[45]
! #define SWIGTYPE_p_std__ostream swig_types[46]
! #define SWIGTYPE_p_a_3__simdata__Matrix3__M_t swig_types[47]
! #define SWIGTYPE_p_simdata__Object swig_types[48]
! #define SWIGTYPE_p_simdata__Packer swig_types[49]
! #define SWIGTYPE_p_simdata__Zulu swig_types[50]
! #define SWIGTYPE_p_std__vectorTfloat_t swig_types[51]
! #define SWIGTYPE_p_simdata__Curve swig_types[52]
! #define SWIGTYPE_p_std__vectorTsimdata__Enum_t swig_types[53]
! #define SWIGTYPE_p_tm swig_types[54]
! #define SWIGTYPE_p_FILE swig_types[55]
! #define SWIGTYPE_p_int swig_types[56]
! #define SWIGTYPE_p_std__vectorTsimdata__Table_t swig_types[57]
! #define SWIGTYPE_p_std__vectorTsimdata__Curve_t swig_types[58]
! #define SWIGTYPE_p_simdata__BaseType swig_types[59]
! #define SWIGTYPE_p_simdata__ListTsimdata__Curve_t swig_types[60]
! #define SWIGTYPE_p_simdata__ListTsimdata__Table_t swig_types[61]
! #define SWIGTYPE_p_simdata__IOError swig_types[62]
! #define SWIGTYPE_p_std__vectorTsimdata__InterfaceProxy_p_t swig_types[63]
! #define SWIGTYPE_p_simdata__SimDate swig_types[64]
! #define SWIGTYPE_p_simdata__InterpolatedData swig_types[65]
! #define SWIGTYPE_p_std__vectorTstd__string_t swig_types[66]
! #define SWIGTYPE_p_simdata__Matrix3 swig_types[67]
! #define SWIGTYPE_p_simdata__InterfaceProxy swig_types[68]
! static swig_type_info *swig_types[70];
/* -------- TYPES TABLE (END) -------- */
***************
*** 19444,19452 ****
PyObject *resultobj;
simdata::TableEntry *arg1 = (simdata::TableEntry *) 0 ;
! int32 arg2 ;
PyObject * obj0 = 0 ;
! if(!PyArg_ParseTuple(args,(char *)"Oi:TableEntry_offset_set",&obj0,&arg2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_simdata__TableEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (arg1) (arg1)->offset = arg2;
--- 19445,19457 ----
PyObject *resultobj;
simdata::TableEntry *arg1 = (simdata::TableEntry *) 0 ;
! gint32 arg2 ;
! gint32 *argp2 ;
PyObject * obj0 = 0 ;
+ PyObject * obj1 = 0 ;
! if(!PyArg_ParseTuple(args,(char *)"OO:TableEntry_offset_set",&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_simdata__TableEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+ if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_gint32,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
+ arg2 = *argp2;
if (arg1) (arg1)->offset = arg2;
***************
*** 19461,19472 ****
PyObject *resultobj;
simdata::TableEntry *arg1 = (simdata::TableEntry *) 0 ;
! int32 result;
PyObject * obj0 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"O:TableEntry_offset_get",&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_simdata__TableEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
! result = (int32) ((arg1)->offset);
! resultobj = PyInt_FromLong((long)result);
return resultobj;
fail:
--- 19466,19481 ----
PyObject *resultobj;
simdata::TableEntry *arg1 = (simdata::TableEntry *) 0 ;
! gint32 result;
PyObject * obj0 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"O:TableEntry_offset_get",&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_simdata__TableEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
! result = ((arg1)->offset);
! {
! gint32 * resultptr;
! resultptr = new gint32((gint32 &) result);
! resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_gint32, 1);
! }
return resultobj;
fail:
***************
*** 19478,19486 ****
PyObject *resultobj;
simdata::TableEntry *arg1 = (simdata::TableEntry *) 0 ;
! int32 arg2 ;
PyObject * obj0 = 0 ;
! if(!PyArg_ParseTuple(args,(char *)"Oi:TableEntry_length_set",&obj0,&arg2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_simdata__TableEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (arg1) (arg1)->length = arg2;
--- 19487,19499 ----
PyObject *resultobj;
simdata::TableEntry *arg1 = (simdata::TableEntry *) 0 ;
! gint32 arg2 ;
! gint32 *argp2 ;
PyObject * obj0 = 0 ;
+ PyObject * obj1 = 0 ;
! if(!PyArg_ParseTuple(args,(char *)"OO:TableEntry_length_set",&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_simdata__TableEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+ if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_gint32,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
+ arg2 = *argp2;
if (arg1) (arg1)->length = arg2;
***************
*** 19495,19506 ****
PyObject *resultobj;
simdata::TableEntry *arg1 = (simdata::TableEntry *) 0 ;
! int32 result;
PyObject * obj0 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"O:TableEntry_length_get",&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_simdata__TableEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
! result = (int32) ((arg1)->length);
! resultobj = PyInt_FromLong((long)result);
return resultobj;
fail:
--- 19508,19523 ----
PyObject *resultobj;
simdata::TableEntry *arg1 = (simdata::TableEntry *) 0 ;
! gint32 result;
PyObject * obj0 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"O:TableEntry_length_get",&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_simdata__TableEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
! result = ((arg1)->length);
! {
! gint32 * resultptr;
! resultptr = new gint32((gint32 &) result);
! resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_gint32, 1);
! }
return resultobj;
fail:
***************
*** 22265,22268 ****
--- 22282,22286 ----
static swig_type_info _swigt__p_simdata__PythonException[] = {{"_p_simdata__PythonException", 0, "simdata::PythonException *", 0},{"_p_simdata__PythonException"},{0}};
static swig_type_info _swigt__p_simdata__Exception[] = {{"_p_simdata__Exception", 0, "simdata::Exception *", 0},{"_p_simdata__Exception"},{"_p_simdata__ParseException", _p_simdata__ParseExceptionTo_p_simdata__Exception},{"_p_simdata__ObjectTypeMismatch", _p_simdata__ObjectTypeMismatchTo_p_simdata__Exception},{"_p_simdata__ObjectMismatch", _p_simdata__ObjectMismatchTo_p_simdata__Exception},{"_p_simdata__CorruptArchive", _p_simdata__CorruptArchiveTo_p_simdata__Exception},{"_p_simdata__IOError", _p_simdata__IOErrorTo_p_simdata__Exception},{"_p_simdata__BadMagic", _p_simdata__BadMagicTo_p_simdata__Exception},{"_p_simdata__BadByteOrder", _p_simdata__BadByteOrderTo_p_simdata__Exception},{"_p_simdata__IndexError", _p_simdata__IndexErrorTo_p_simdata__Exception},{0}};
+ static swig_type_info _swigt__p_gint32[] = {{"_p_gint32", 0, "gint32 *", 0},{"_p_gint32"},{0}};
static swig_type_info _swigt__p_std__ostream[] = {{"_p_std__ostream", 0, "std::ostream *", 0},{"_p_std__ostream"},{0}};
static swig_type_info _swigt__p_a_3__simdata__Matrix3__M_t[] = {{"_p_a_3__simdata__Matrix3__M_t", 0, "simdata::Matrix3::M_t [3][3]", 0},{"_p_a_3__simdata__Matrix3__M_t"},{"_p_a_3__double"},{0}};
***************
*** 22335,22338 ****
--- 22353,22357 ----
_swigt__p_simdata__PythonException,
_swigt__p_simdata__Exception,
+ _swigt__p_gint32,
_swigt__p_std__ostream,
_swigt__p_a_3__simdata__Matrix3__M_t,
|
