|
From: <mk...@us...> - 2003-03-20 18:34:18
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv17571/Source
Modified Files:
Matrix3.cpp cSimData.i
Log Message:
See CHANGES.current
Index: Matrix3.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Matrix3.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Matrix3.cpp 20 Mar 2003 00:24:48 -0000 1.3
--- Matrix3.cpp 20 Mar 2003 17:53:43 -0000 1.4
***************
*** 275,283 ****
*/
! Vector3 operator*(const Matrix3& rkMatrix, const Vector3& rkPoint)
{
! double *row0 = &(rkMatrix.rowcol[0][0]);
! double *row1 = &(rkMatrix.rowcol[1][0]);
! double *row2 = &(rkMatrix.rowcol[2][0]);
double x, y, z;
x = rkPoint.x * *row0++;
--- 275,283 ----
*/
! Vector3 operator*(Matrix3 const & rkMatrix, Vector3 const & rkPoint)
{
! double const *row0 = &(rkMatrix.rowcol[0][0]);
! double const *row1 = &(rkMatrix.rowcol[1][0]);
! double const *row2 = &(rkMatrix.rowcol[2][0]);
double x, y, z;
x = rkPoint.x * *row0++;
***************
*** 294,302 ****
! Vector3 operator* (const Vector3& rkPoint, const Matrix3& rkMatrix)
{
! double *row0 = &(rkMatrix.rowcol[0][0]);
! double *row1 = &(rkMatrix.rowcol[1][0]);
! double *row2 = &(rkMatrix.rowcol[2][0]);
double x, y, z;
x = rkPoint.x * *row0++ + rkPoint.y * *row1++ + rkPoint.z * *row2++;
--- 294,302 ----
! Vector3 operator* (Vector3 const & rkPoint, Matrix3 const & rkMatrix)
{
! double const *row0 = &(rkMatrix.rowcol[0][0]);
! double const *row1 = &(rkMatrix.rowcol[1][0]);
! double const *row2 = &(rkMatrix.rowcol[2][0]);
double x, y, z;
x = rkPoint.x * *row0++ + rkPoint.y * *row1++ + rkPoint.z * *row2++;
Index: cSimData.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/cSimData.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** cSimData.i 18 Mar 2003 10:04:06 -0000 1.5
--- cSimData.i 20 Mar 2003 17:53:44 -0000 1.6
***************
*** 1,54 ****
%module cSimData
! %{
! #include <SimData/HashUtility.h>
! #include <SimData/Exception.h>
! #include <SimData/Types.h>
! #include <SimData/DataArchive.h>
! #include <SimData/InterfaceRegistry.h>
! #include <SimData/Version.h>
!
! %}
!
! %include "std_string.i"
! %include "std_vector.i"
!
! %include "SimData/ns-simdata.h"
! %include "SimData/Export.h"
! %include "SimData/Version.h"
!
! %include "SimData/Log.i"
!
! %feature("polymorphic") SIMDATA(InterfaceProxy);
! %feature("polymorphic") SIMDATA(Object);
!
! %feature("polymorphic:except") {
! if ($error != NULL) {
! printf("got a python exception\n");
! throw SIMDATA(PythonException)();
! }
! }
!
! %include "SimData/Exception.i"
! %include "SimData/HashUtility.i"
! %include "SimData/Types.i"
!
! %exception {
! try {
! $action
! } catch (SIMDATA(PythonException) &e) {
! printf("SWIG: passing Python exception back\n");
! return NULL;
! } catch (SIMDATA(Exception) e) {
! printf("SWIG: caught a SimData Exception\n");
! e.details();
! return NULL;
! } catch (...) {
! printf("SWIG: passing C++ exception back\n");
! return NULL;
! }
! }
- %include "SimData/DataArchive.i"
- %include "SimData/InterfaceRegistry.i"
- %exception;
--- 1,4 ----
%module cSimData
! %include "SimData/cSimData.i"
|