csp-commits — Mailing list for CVS commit messages.

[Csp-commits] APPLICATIONS/CSPSim configure.in,1.8,1.9

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv13573

Modified Files:
	configure.in 
Log Message:
config fixes

Index: configure.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** configure.in	15 Mar 2003 03:14:38 -0000	1.8
--- configure.in	20 Mar 2003 18:38:01 -0000	1.9
***************
*** 8,11 ****
--- 8,13 ----
  dnl   -OS
  
+ AC_PREREQ(2.57)
+ 
  dnl Process this file with autoconf to produce a configure script.
  AC_INIT(Source/CSPSim.cpp)
***************
*** 41,52 ****
  
  dnl check for SDL Console Library
! AC_CHECK_LIB(SDL_console, CON_DrawConsole, [], [AC_MSG_ERROR([
! SDL_console does not appear to be installed.  You can download
! this library from http://sdlconsole.tuxfamily.org
! If SDL_console is already installed, please specify a library 
! path when running configure: --sdl_image_path=xxx])], [])
  
  dnl check for Geospatial Data Abstraction Library 
! CSP_LIB_CONFIG([GDAL], [gdal], [1.1.7], [Geospatial Data Abstraction Library], [http://remotesensing.org/gdal/])
  
  dnl check for OpenSceneGraph
--- 43,54 ----
  
  dnl check for SDL Console Library
! #AC_CHECK_LIB(SDL_console, CON_DrawConsole, [], [AC_MSG_ERROR([
! #SDL_console does not appear to be installed.  You can download
! #this library from http://sdlconsole.tuxfamily.org
! #If SDL_console is already installed, please specify a library 
! #path when running configure: --sdl_image_path=xxx])], [])
  
  dnl check for Geospatial Data Abstraction Library 
! #CSP_LIB_CONFIG([GDAL], [gdal], [1.1.7], [Geospatial Data Abstraction Library], [http://remotesensing.org/gdal/])
  
  dnl check for OpenSceneGraph
***************
*** 69,83 ****
  #CSP_OSG_CONFIG(osgParticle, 0.9.3, [OpenSceneGraph Particle library])
  
! CSP_PYTHON(2.2.0)
! 
! #AC_CHECK_LIB(osgGLUT, osgGLUTGetVersion, ,
! #     [AC_MSG_ERROR(OpenSceneGraph GLUT library not found. See http://www.openscenegraph.org)],)
! #AC_CHECK_LIB(osgUtil, osgUtilGetVersion, ,
! #     [AC_MSG_ERROR(OpenSceneGraph Util library not found. See http://www.openscenegraph.org)],)
! #AC_CHECK_LIB(osgText, osgTextGetVersion, ,
! #     [AC_MSG_ERROR(OpenSceneGraph Text library not found. See http://www.openscenegraph.org)],)
! #AC_CHECK_LIB(osgParticle, osgParticleGetVersion, ,
! #     [AC_MSG_ERROR(OpenSceneGraph Particle library not found. See http://www.openscenegraph.org)],)
  
  
  AC_OUTPUT([Makefile Source/Makefile], [])
--- 71,84 ----
  #CSP_OSG_CONFIG(osgParticle, 0.9.3, [OpenSceneGraph Particle library])
  
! AC_CHECK_LIB(osgGLUT, osgGLUTGetVersion, ,
!      [AC_MSG_ERROR(OpenSceneGraph GLUT library not found. See http://www.openscenegraph.org)],)
! AC_CHECK_LIB(osgUtil, osgUtilGetVersion, ,
!      [AC_MSG_ERROR(OpenSceneGraph Util library not found. See http://www.openscenegraph.org)],)
! AC_CHECK_LIB(osgText, osgTextGetVersion, ,
!      [AC_MSG_ERROR(OpenSceneGraph Text library not found. See http://www.openscenegraph.org)],)
! AC_CHECK_LIB(osgParticle, osgParticleGetVersion, ,
!      [AC_MSG_ERROR(OpenSceneGraph Particle library not found. See http://www.openscenegraph.org)],)
  
+ CSP_PYTHON(2.2.0)
  
  AC_OUTPUT([Makefile Source/Makefile], [])

[Csp-commits] APPLICATIONS/SimData/Include/SimData cSimData.i,1.3,1.4

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv17571/Include/SimData

Modified Files:
	cSimData.i 
Log Message:
See CHANGES.current

Index: cSimData.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/cSimData.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cSimData.i	18 Mar 2003 10:04:04 -0000	1.3
--- cSimData.i	20 Mar 2003 17:53:41 -0000	1.4
***************
*** 1,3 ****
! %module cSimData
  
  %{
--- 1,23 ----
! /* SimDataCSP: Data Infrastructure for Simulations
!  * Copyright (C) 2002 Mark Rose <tm...@st...>
!  * 
!  * This file is part of SimDataCSP.
!  * 
!  * This program is free software; you can redistribute it and/or
!  * modify it under the terms of the GNU General Public License
!  * as published by the Free Software Foundation; either version 2
!  * of the License, or (at your option) any later version.
!  * 
!  * This program is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  * GNU General Public License for more details.
!  * 
!  * You should have received a copy of the GNU General Public License
!  * along with this program; if not, write to the Free Software
!  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
!  */
! 
! %module SimData.cSimData
  
  %{
***************
*** 7,10 ****
--- 27,31 ----
  #include <SimData/DataArchive.h>
  #include <SimData/InterfaceRegistry.h>
+ #include <SimData/Version.h>
  
  %}
***************
*** 15,18 ****
--- 36,40 ----
  %include "SimData/ns-simdata.h"
  %include "SimData/Export.h"
+ %include "SimData/Version.h"
  
  %include "SimData/Log.i"
***************
*** 22,29 ****
  
  %feature("polymorphic:except") {
! 	if ($error != NULL) {
! 		printf("got a python exception\n");
! 		throw SIMDATA(PythonException)();
! 	}
  }
  
--- 44,51 ----
  
  %feature("polymorphic:except") {
!     if ($error != NULL) {
!         printf("got a python exception\n");
!         throw SIMDATA(PythonException)();
!     }
  }
  
***************
*** 34,45 ****
  %exception {
          try {
! 		$action
          } catch (SIMDATA(PythonException) &e) {
! 		printf("SWIG: passing Python exception back\n");
! 		return NULL;
          } catch (...) {
! 		printf("SWIG: passing C++ exception back\n");
! 		return NULL;
! 	}
  }
  
--- 56,71 ----
  %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;
!     }
  }
  
***************
*** 47,51 ****
  %include "SimData/InterfaceRegistry.i"
  %exception;
- 
- 
- 
--- 73,74 ----

[Csp-commits] APPLICATIONS/SimData/Source Matrix3.cpp,1.3,1.4 cSimData.i,1.5,1.6

[<mk...@us...>]

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"
  

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.5,1.6 setup.py,1.2,1.3

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv17571

Modified Files:
	CHANGES.current setup.py 
Log Message:
See CHANGES.current

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CHANGES.current	20 Mar 2003 00:24:47 -0000	1.5
--- CHANGES.current	20 Mar 2003 17:53:37 -0000	1.6
***************
*** 1,4 ****
--- 1,15 ----
  Version 0.3.1 (in progress)
  ===========================
+ 2003-03-20: onsight
+             Fixed const cast in matrix * vector routines.  Why doesn't
+ 	    gcc 3.2.1 -Wall catch this? (!)
+ 
+ 	    Changed cSimData.i in Source to include the main version in
+ 	    Include/SimData.  These differ in their %module directive.
+ 	    The main one uses SimData.cSimData, which is needed for 3rd
+ 	    party apps than import the SimData interface for SWIG.  The
+ 	    version used to build SimData (in Source) uses just
+ 	    %module SimData.
+ 
  2003-03-19: onsight
              Changed Enumeration implementation to use std::map<> instead

Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** setup.py	20 Mar 2003 00:24:47 -0000	1.2
--- setup.py	20 Mar 2003 17:53:39 -0000	1.3
***************
*** 63,66 ****
--- 63,67 ----
  		print "Installing SimData headers to", incpath
  		copy_dir("Include/SimData", incpath, headers)
+ 		copy_dir("Include/SimData", incpath, interfaces)
  	except Exception, e:
  		print e
***************
*** 217,228 ****
  
  interfaces = [
! 	"cSimData"
  ]
  
  def fullpath(path, ext, list):
  	return map(lambda x: path+x+ext, list)
  
  sources = fullpath("Source/", ".cpp", sources)
! interfaces = fullpath("Source/", ".i", interfaces)
  headers_fullpath = fullpath("Include/SimData/", "", headers)
  
--- 218,258 ----
  
  interfaces = [
! 	"cSimData.i",
! 	"BaseType.i",
! 	"HashUtility.i",
! 	"Object.i",
! 	"Vector3.i",
! 	"DataArchive.i",
! 	"InterfaceRegistry.i",
! 	"Pack.i",
! 	"cSimData.i",
! 	"Date.i",
! 	"Interpolate.i",
! 	"Path.i",
! 	"filemap.i",
! 	"Enum.i",
! 	"List.i",
! 	"Random.i",
! 	"vector.i",
! 	"Exception.i",
! 	"Log.i",
! 	"Spread.i",
! 	"External.i",
! 	"Math.i",
! 	"String.i",
! 	"GeoPos.i",
! 	"Matrix3.i",
! 	"Types.i",
  ]
  
+ 
  def fullpath(path, ext, list):
  	return map(lambda x: path+x+ext, list)
  
+ main_interface = ["cSimData.i"]
+ 
  sources = fullpath("Source/", ".cpp", sources)
! main_interface_fullpath = fullpath("Source/", "", main_interface)
! interfaces_fullpath = fullpath("Include/SimData/", "", interfaces)
  headers_fullpath = fullpath("Include/SimData/", "", headers)
  
***************
*** 238,242 ****
  
  cSimData = Extension("SimData._cSimData", 
!                      sources + interfaces, 
  					 include_dirs = includes,
  					 define_macros = defines,
--- 268,272 ----
  
  cSimData = Extension("SimData._cSimData", 
!                      sources + main_interface_fullpath, 
  					 include_dirs = includes,
  					 define_macros = defines,
***************
*** 252,256 ****
        url="http://csp.sourceforge.net/wiki/",
        packages=['SimData'],
! 	  headers = headers_fullpath,
  	  ext_modules = [cSimData],
  	  )
--- 282,286 ----
        url="http://csp.sourceforge.net/wiki/",
        packages=['SimData'],
! 	  headers = headers_fullpath + interfaces_fullpath + main_interface_fullpath,
  	  ext_modules = [cSimData],
  	  )

[Csp-commits] APPLICATIONS/SimData/Source Enum.cpp,1.3,1.4 Makefile,1.4,1.5 Matrix3.cpp,1.2,1.3 Vector3.cpp,1.3,1.4

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv12601/Source

Modified Files:
	Enum.cpp Makefile Matrix3.cpp Vector3.cpp 
Log Message:
see CHANGES.current

Index: Enum.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Enum.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Enum.cpp	18 Mar 2003 06:41:49 -0000	1.3
--- Enum.cpp	20 Mar 2003 00:24:48 -0000	1.4
***************
*** 28,31 ****
--- 28,35 ----
  }
  
+ Enum::Enum(const Enum &e): _parent(0) {
+ 	__assign(&e);
+ }
+ 
  Enum::~Enum() {
  }
***************
*** 127,130 ****
--- 131,140 ----
  }
  
+ Enumeration::~Enumeration() { 
+ 	_enums.clear(); 
+ 	_map.clear(); 
+ 	_strings.clear(); 
+ }
+ 
  const std::vector<Enum> Enumeration::each() const { return _enums; }
  
***************
*** 184,190 ****
  bool Enumeration::__contains__(int i) const { return contains(i); }
  bool Enumeration::__contains__(const std::string& i) const { return contains(i); }
! const Enum& Enumeration::__getitem__(int n) const { return _enums[n]; }
! const Enum& Enumeration::__getitem__(const std::string& s) const { return this->operator[](s); }
! const Enum& Enumeration::__getattr_c__(const std::string& s) const {
  	return this->operator[](s);
  }
--- 194,200 ----
  bool Enumeration::__contains__(int i) const { return contains(i); }
  bool Enumeration::__contains__(const std::string& i) const { return contains(i); }
! const Enum Enumeration::__getitem__(int n) const { return _enums[n]; }
! const Enum Enumeration::__getitem__(const std::string& s) const { return this->operator[](s); }
! const Enum Enumeration::__getattr_c__(const std::string& s) const {
  	return this->operator[](s);
  }

Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	18 Mar 2003 10:04:05 -0000	1.4
--- Makefile	20 Mar 2003 00:24:48 -0000	1.5
***************
*** 56,59 ****
--- 56,61 ----
  	rm -f $(MODULES:%=%_wrap.o)
  	rm -f $(DEPDIR)/*.d
+ 	rm -f $(TOPDIR)/SimData/_cSimData.so
+ 	rm -f $(TOPDIR)/SimData/cSimData.py
  
  clean-dependencies:
***************
*** 94,100 ****
--- 96,104 ----
  _cSimData.so: $(OBJECTS) cSimData_wrap.o
  	$(CXX) -Wl,-z,lazyload $(LDOPTS) -o$@ $^
+ 	cp $@ $(TOPDIR)/SimData
  
  cSimData_wrap.cpp: cSimData.i
  	$(SWIG) $(SWOPTS) -o $@ $< 
+ 	cp cSimData.py $(TOPDIR)/SimData
  
  cSimData_wrap.o: cSimData_wrap.cpp

Index: Matrix3.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Matrix3.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Matrix3.cpp	28 Jan 2003 23:26:07 -0000	1.2
--- Matrix3.cpp	20 Mar 2003 00:24:48 -0000	1.3
***************
*** 69,74 ****
  
  Matrix3::Matrix3(double fEntry00, double fEntry01, double fEntry02,
!                                  double fEntry10, double fEntry11, double fEntry12, 
!                                  double fEntry20, double fEntry21, double fEntry22)
  {
  	rowcol[0][0] = fEntry00;
--- 69,74 ----
  
  Matrix3::Matrix3(double fEntry00, double fEntry01, double fEntry02,
!                  double fEntry10, double fEntry11, double fEntry12, 
!                  double fEntry20, double fEntry21, double fEntry22)
  {
  	rowcol[0][0] = fEntry00;
***************
*** 84,89 ****
  
  Matrix3::Matrix3(const Vector3& column1, // a matrix is given by 3 column vectors
!                                  const Vector3& column2, 
!                                  const Vector3& column3)
  {
  	SetColumn(0, column1);
--- 84,89 ----
  
  Matrix3::Matrix3(const Vector3& column1, // a matrix is given by 3 column vectors
!                  const Vector3& column2, 
!                  const Vector3& column3)
  {
  	SetColumn(0, column1);
***************
*** 227,230 ****
--- 227,250 ----
  }
  
+ // multiplication (proxy) operators for Python
+ 
+ Matrix3 Matrix3::__mul__(const Matrix3& m) const {
+ 	return (*this)*m;
+ }
+ 
+ Matrix3 Matrix3::__mul__(double v) const {
+ 	return (*this)*v;
+ }
+ 
+ Matrix3 Matrix3::__rmul__(double v) const {
+ 	return (*this)*v;
+ }
+ 
+ Vector3 Matrix3::__mul__(const Vector3& v) const {
+ 	return (*this)*v;
+ }
+ 
+ 
+ /*
  Vector3 operator*(const Matrix3& rkMatrix,
                            const Vector3& rkPoint) // Checked
***************
*** 233,239 ****
  	for (int iRow = 0; iRow < 3; ++iRow) {
  		kProd[iRow] =
! 			rkMatrix.rowcol[iRow][0]*rkPoint[0] +
! 			rkMatrix.rowcol[iRow][1]*rkPoint[1] +
! 			rkMatrix.rowcol[iRow][2]*rkPoint[2];
  	}
  	return kProd;
--- 253,259 ----
  	for (int iRow = 0; iRow < 3; ++iRow) {
  		kProd[iRow] =
! 			rkMatrix.rowcol[iRow][0]*rkPoint.x +
! 			rkMatrix.rowcol[iRow][1]*rkPoint.y +
! 			rkMatrix.rowcol[iRow][2]*rkPoint.z;
  	}
  	return kProd;
***************
*** 241,245 ****
  
  
- /*
  Vector3 operator* (const Vector3& rkPoint, const Matrix3& rkMatrix)
  {
--- 261,264 ----
***************
*** 248,257 ****
  	{
  		kProd[iCol] =
! 			rkPoint[0]*rkMatrix.rowcol[0][iCol] +
! 			rkPoint[1]*rkMatrix.rowcol[1][iCol] +
! 			rkPoint[2]*rkMatrix.rowcol[2][iCol];
  	}
  	return kProd;
! }*/
  
  Matrix3 Matrix3::operator-() const
--- 267,309 ----
  	{
  		kProd[iCol] =
! 			rkPoint.x*rkMatrix.rowcol[0][iCol] +
! 			rkPoint.y*rkMatrix.rowcol[1][iCol] +
! 			rkPoint.z*rkMatrix.rowcol[2][iCol];
  	}
  	return kProd;
! }
! */
! 
! 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++;
! 	x += rkPoint.y * *row0++;
! 	x += rkPoint.z * *row0++;
! 	y  = rkPoint.x * *row1++; 
! 	y += rkPoint.y * *row1++;
! 	y += rkPoint.z * *row1++;
! 	z  = rkPoint.x * *row2++; 
! 	z += rkPoint.y * *row2++;
! 	z += rkPoint.z * *row2++;
! 	return Vector3(x, y, z);
! }
! 
! 
! 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++;
! 	y = rkPoint.x * *row0++ + rkPoint.y * *row1++ + rkPoint.z * *row2++;
! 	z = rkPoint.x * *row0++ + rkPoint.y * *row1++ + rkPoint.z * *row2++;
! 	return Vector3(x, y, z);
! }
! 
  
  Matrix3 Matrix3::operator-() const
***************
*** 887,907 ****
  }
  
- 
- /*
- // Methods for SWIG
- #if defined(SWIG) || defined(SWIGPYTHON)
- std::string Matrix3::__repr__() { 
- 	return asString(); 
- }
- 
- Vector3 Matrix3::__mul__(const Vector3 &v) const {
- 	return *this * v;
- }
- 
- Matrix3 Matrix3::__mul__(double fScalar) const {
- 	return *this * fScalar;
- }
- #endif // SWIG
- */
  
  
--- 939,942 ----

Index: Vector3.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Vector3.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Vector3.cpp	18 Mar 2003 06:41:50 -0000	1.3
--- Vector3.cpp	20 Mar 2003 00:24:48 -0000	1.4
***************
*** 134,138 ****
   * Print string representation to a stream.
   */
! void Vector3::Print(FILE * stream)
  {
  	fprintf(stream, "[%f, %f, %f]\n", x, y, z);
--- 134,138 ----
   * Print string representation to a stream.
   */
! void Vector3::Print(FILE * stream) const
  {
  	fprintf(stream, "[%f, %f, %f]\n", x, y, z);
***************
*** 141,145 ****
  //} // namespace Math
  
! Matrix3 Vector3::StarMatrix()
  {
  	Matrix3 mat;
--- 141,145 ----
  //} // namespace Math
  
! Matrix3 Vector3::StarMatrix() const
  {
  	Matrix3 mat;
***************
*** 175,187 ****
  }
  
! Vector3 Vector3::Cross(const Vector3 & a) {
  	return SIMDATA(Cross)(*this, a);
  }
  
! double Vector3::Dot(const Vector3 & a) {
  	return SIMDATA(Dot)(*this, a);
  }
  
! std::vector<double> Vector3::GetElements() {
  	std::vector<double> elements;
  	elements.push_back(x);
--- 175,187 ----
  }
  
! Vector3 Vector3::Cross(const Vector3 & a) const {
  	return SIMDATA(Cross)(*this, a);
  }
  
! double Vector3::Dot(const Vector3 & a) const {
  	return SIMDATA(Dot)(*this, a);
  }
  
! std::vector<double> Vector3::GetElements() const {
  	std::vector<double> elements;
  	elements.push_back(x);
***************
*** 219,222 ****
--- 219,226 ----
  	z = Z;
  	if (n!=3) throw ParseException("SYNTAX ERROR: expecting 3 floats");
+ }
+ 
+ Vector3 Vector3::__mul__(const Matrix3 & a) const { 
+ 	return (*this)*a; 
  }
  

[Csp-commits] APPLICATIONS/SimData/Include/SimData Enum.h,1.3,1.4 Enum.i,1.2,1.3 HashUtility.h,1.6,1.7 Matrix3.h,1.4,1.5 Vector3.h,1.4,1.5 Vector3.inl,1.4,1.5 ns-simdata.h,1.2,1.3

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv12601/Include/SimData

Modified Files:
	Enum.h Enum.i HashUtility.h Matrix3.h Vector3.h Vector3.inl 
	ns-simdata.h 
Log Message:
see CHANGES.current

Index: Enum.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Enum.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Enum.h	18 Mar 2003 06:41:34 -0000	1.3
--- Enum.h	20 Mar 2003 00:24:47 -0000	1.4
***************
*** 36,42 ****
  #include <cstdio>
  #include <iostream>
  
  #include <SimData/BaseType.h>
- #include <SimData/HashUtility.h>
  
  
--- 36,42 ----
  #include <cstdio>
  #include <iostream>
+ #include <map>
  
  #include <SimData/BaseType.h>
  
  
***************
*** 110,113 ****
--- 110,114 ----
  public:
  	Enum();
+ 	Enum(const Enum &);
  	Enum(const Enumeration& parent, int idx=0);
  	Enum(const Enumeration& parent, const std::string &s);
***************
*** 150,153 ****
--- 151,155 ----
   */
  class Enumeration {
+ 	typedef std::map<std::string, int> string_map;
  	string_map _map;
  	std::vector<Enum> _enums;
***************
*** 156,159 ****
--- 158,162 ----
  public:
  	explicit Enumeration(const char* items);
+ 	~Enumeration();
  	const std::vector<Enum> each() const;
  	const std::vector<std::string> eachString() const;
***************
*** 177,183 ****
  	bool __contains__(int i) const;
  	bool __contains__(const std::string& i) const;
! 	const Enum& __getitem__(int n) const;
! 	const Enum& __getitem__(const std::string& s) const;
! 	const Enum& __getattr_c__(const std::string& s) const;
  
  	std::string asString() const { return "<simdata::Enumeration>"; }
--- 180,186 ----
  	bool __contains__(int i) const;
  	bool __contains__(const std::string& i) const;
! 	const Enum __getitem__(int n) const;
! 	const Enum __getitem__(const std::string& s) const;
! 	const Enum __getattr_c__(const std::string& s) const;
  
  	std::string asString() const { return "<simdata::Enumeration>"; }
***************
*** 191,195 ****
  	def __getattr__(*args): 
  		self, name = args
! 		if name in ["this", "thisown", "__str__"]: 
  			return _swig_getattr(self, Enumeration, name)
  		return apply(_cSimData.Enumeration___getattr_c__,args)
--- 194,198 ----
  	def __getattr__(*args): 
  		self, name = args
! 		if name.startswith('__') or name in ("this", "thisown"):
  			return _swig_getattr(self, Enumeration, name)
  		return apply(_cSimData.Enumeration___getattr_c__,args)

Index: Enum.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Enum.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Enum.i	28 Jan 2003 23:26:05 -0000	1.2
--- Enum.i	20 Mar 2003 00:24:47 -0000	1.3
***************
*** 7,10 ****
--- 7,11 ----
  %include "std_vector.i"
  
+ %include "SimData/ns-simdata.h"
  
  %template(vEnum) std::vector<SIMDATA(Enum)>;
***************
*** 17,27 ****
  
  //%import "SimData/Pack.i"
! %ignore eqstring;
! %ignore hashstring;
! %ignore string_map;
  
  #define TRY	try { $action }
  #define CATCH(a, b) \
  	catch (a& e) {\
  		SWIG_exception(b, const_cast<char*>(e.getError().c_str()));\
  	}
--- 18,29 ----
  
  //%import "SimData/Pack.i"
! //%ignore eqstring;
! //%ignore hashstring;
! //%ignore string_map;
  
  #define TRY	try { $action }
  #define CATCH(a, b) \
  	catch (a& e) {\
+ 		std::cout << "EXCEPT\n"; \
  		SWIG_exception(b, const_cast<char*>(e.getError().c_str()));\
  	}
***************
*** 35,48 ****
  	CATCH(SIMDATA(EnumError), SWIG_RuntimeError)
  }
- /*
- %exception Enumeration {
- 	TRY
- 	CATCH(EnumTypeError, SWIG_TypeError)
- 	CATCH(EnumIndexError, SWIG_IndexError)
- 	CATCH(EnumError, SWIG_RuntimeError)
- }
- */		
- 
- %include "SimData/ns-simdata.h"
  
  %rename(__repr__) SIMDATA(Enum)::asString() const;
--- 37,40 ----

Index: HashUtility.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/HashUtility.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** HashUtility.h	18 Mar 2003 10:04:01 -0000	1.6
--- HashUtility.h	20 Mar 2003 00:24:47 -0000	1.7
***************
*** 183,199 ****
  #endif
  
- /*
- struct equ8 {
- 	bool operator()(u8 i1, u8 i2) const {
- 		return (i1 == i2);
- 	}
- };
- 
- struct hashu8 {
- 	u8 operator()(u8 i) const {
- 		return i;
- 	}
- };
- */
  
  /*
--- 183,186 ----
***************
*** 224,228 ****
  #endif
  
- 
  class Object;
  class ObjectProxyBase;
--- 211,214 ----
***************
*** 235,244 ****
  typedef HASH_MAPS<hasht, Object*, hasht_hash, hasht_eq>::Type cache_map;
  typedef HASH_MAPS<hasht, ObjectProxyBase*, hasht_hash, hasht_eq>::Type proxy_map;
! 
! typedef HASH_MAPS<const std::string, int, hashstring, eqstring>::Type string_map;
  
  extern std::ostream & operator<<(std::ostream &o, const hasht &x);
  
  NAMESPACE_END // namespace simdata
  
  #endif // __HASHUTILITY_H__
--- 221,232 ----
  typedef HASH_MAPS<hasht, Object*, hasht_hash, hasht_eq>::Type cache_map;
  typedef HASH_MAPS<hasht, ObjectProxyBase*, hasht_hash, hasht_eq>::Type proxy_map;
! //typedef HASH_MAPS<const std::string, int, hashstring, eqstring>::Type string_map;
  
  extern std::ostream & operator<<(std::ostream &o, const hasht &x);
  
+ 
  NAMESPACE_END // namespace simdata
  
+ 
  #endif // __HASHUTILITY_H__
+ 

Index: Matrix3.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Matrix3.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Matrix3.h	2 Feb 2003 15:36:09 -0000	1.4
--- Matrix3.h	20 Mar 2003 00:24:47 -0000	1.5
***************
*** 107,116 ****
  
  	// arithmetic operations
  	Matrix3 operator+(const Matrix3& rkMatrix) const;
  	Matrix3 operator-(const Matrix3& rkMatrix) const;
  	Matrix3 operator*(const Matrix3& rkMatrix) const;
- 	Matrix3 operator-() const;
- 	// matrix * scalar
  	Matrix3 operator*(double fScalar) const;
  
  #ifndef SWIG
--- 107,117 ----
  
  	// arithmetic operations
+ 	Matrix3 operator-() const;
  	Matrix3 operator+(const Matrix3& rkMatrix) const;
  	Matrix3 operator-(const Matrix3& rkMatrix) const;
+ #ifndef SWIG
  	Matrix3 operator*(const Matrix3& rkMatrix) const;
  	Matrix3 operator*(double fScalar) const;
+ #endif // SWIG
  
  #ifndef SWIG
***************
*** 120,125 ****
  
  	// vector * matrix [1x3 * 3x3 = 1x3]
! 	// friend Vector3 operator*(const Vector3& rkVector,
! 	//				     const Matrix3& rkMatrix);
  	
  	// scalar * matrix
--- 121,126 ----
  
  	// vector * matrix [1x3 * 3x3 = 1x3]
! 	friend Vector3 operator*(const Vector3& rkVector,
! 		                 const Matrix3& rkMatrix);
  	
  	// scalar * matrix
***************
*** 188,201 ****
  	friend std::ostream & operator<< (std::ostream & os, const Matrix3 & m);
  #endif // SWIG
  
! //#if defined(SWIG) || defined(SWIGPYTHON)
! //	std::string __repr__() { return toString(); }
! 	/*
! 	Vector3 __mul__(const Vector3 &v) const;
! 	Matrix3 __mul__(double fScalar) const;
! 	*/
  
  #ifdef SWIG 
- //%rename(__mul__) Matrix::operator*;
  %insert("shadow") %{
  %}
--- 189,210 ----
  	friend std::ostream & operator<< (std::ostream & os, const Matrix3 & m);
  #endif // SWIG
+ 	
+ 	// explicit multiplication operators for Python
+ 	Matrix3 __mul__(const Matrix3 &a) const;
+ 	Matrix3 __mul__(double a) const;
+ 	Matrix3 __rmul__(double a) const;
+ 	Vector3 __mul__(const Vector3 &a) const;
  
! #ifdef SWIG_____NOTYETREADY
! 	%extend {
! //		bool operator==(const Vector3 & a) { return *self == a; }
! //		bool operator!=(const Vector3 & a) { return *self != a; }
! //		Vector3 operator*(const Vector3 & a) { return (*self)*a; }
! //		Matrix3 operator*(const Matrix3 & a) { return (*self)*a; }
! //		Matrix3 operator*(double a) { return (*self)*a; }
! 	}
! #endif // SWIG 
  
  #ifdef SWIG 
  %insert("shadow") %{
  %}

Index: Vector3.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Vector3.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Vector3.h	18 Mar 2003 06:41:35 -0000	1.4
--- Vector3.h	20 Mar 2003 00:24:47 -0000	1.5
***************
*** 103,106 ****
--- 103,107 ----
  	Vector3 operator -() const;
  
+ #ifndef SWIG
  	/**
  	 * Multiply a vector by a scalar.
***************
*** 111,115 ****
  	}
  
- #ifndef SWIG
  	// friend arithmetic operators
  	friend Vector3 operator/(const Vector3 &a, double f);
--- 112,115 ----
***************
*** 122,126 ****
  	double Length() const;
  	double LengthSquared() const;
! 	bool IsNull();
  	Vector3 & Normalize();
  	double Unitize(double  fTolerance = 1e-06);
--- 122,126 ----
  	double Length() const;
  	double LengthSquared() const;
! 	bool IsNull() const;
  	Vector3 & Normalize();
  	double Unitize(double  fTolerance = 1e-06);
***************
*** 136,146 ****
  #endif // SWIG
  	
! 	Vector3 Cross(const Vector3 & a);
! 	double Dot(const Vector3 & a);
! 	std::vector<double> GetElements();
  
! 	Matrix3 StarMatrix();
  
! 	void Print(FILE * stream);
  
  	static const Vector3 ZERO;
--- 136,146 ----
  #endif // SWIG
  	
! 	Vector3 Cross(const Vector3 & a) const;
! 	double Dot(const Vector3 & a) const;
! 	std::vector<double> GetElements() const;
  
! 	Matrix3 StarMatrix() const;
  
! 	void Print(FILE * stream) const;
  
  	static const Vector3 ZERO;
***************
*** 155,163 ****
  	virtual std::string asString() const;
  	
  #ifdef SWIG
  	%extend {
  		bool operator==(const Vector3 & a) { return *self == a; }
  		bool operator!=(const Vector3 & a) { return *self != a; }
- 		double operator*(const Vector3 & a) { return self->Dot(a); }
  	}
  #endif // SWIG 
--- 155,167 ----
  	virtual std::string asString() const;
  	
+ 	double __mul__(const Vector3 & a) const { return Dot(a); }
+ 	Vector3 __mul__(const Matrix3 & a) const;
+ 	Vector3 __mul__(double a) const { return (*this)*a; }
+ 	Vector3 __rmul__(double a) const { return (*this)*a; }
+ 	
  #ifdef SWIG
  	%extend {
  		bool operator==(const Vector3 & a) { return *self == a; }
  		bool operator!=(const Vector3 & a) { return *self != a; }
  	}
  #endif // SWIG 

Index: Vector3.inl
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Vector3.inl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Vector3.inl	18 Mar 2003 10:04:04 -0000	1.4
--- Vector3.inl	20 Mar 2003 00:24:47 -0000	1.5
***************
*** 242,246 ****
   * Determine if all the components of the vector are zero.
   */ 
! inline bool Vector3::IsNull()
  {
  	return ((x == 0.0f) && (y == 0.0f) && (z == 0.0f));
--- 242,246 ----
   * Determine if all the components of the vector are zero.
   */ 
! inline bool Vector3::IsNull() const
  {
  	return ((x == 0.0f) && (y == 0.0f) && (z == 0.0f));

Index: ns-simdata.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/ns-simdata.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ns-simdata.h	28 Jan 2003 23:26:06 -0000	1.2
--- ns-simdata.h	20 Mar 2003 00:24:47 -0000	1.3
***************
*** 28,34 ****
  #define __NS_SIMDATA_H__
  
- #ifndef USE_NAMESPACE_SIMDATA
  // turn on the simdata namespace by default
  #define USE_NAMESPACE_SIMDATA
  #endif // USE_NAMESPACE_SIMDATA
  
--- 28,36 ----
  #define __NS_SIMDATA_H__
  
  // turn on the simdata namespace by default
  #define USE_NAMESPACE_SIMDATA
+ 
+ #ifdef NO_NAMESPACE_SIMDATA
+ #undef USE_NAMESPACE_SIMDATA
  #endif // USE_NAMESPACE_SIMDATA
  

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.4,1.5 Makefile,1.4,1.5 README,1.3,1.4 setup.py,1.1,1.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv12601

Modified Files:
	CHANGES.current Makefile README setup.py 
Log Message:
see CHANGES.current

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CHANGES.current	18 Mar 2003 10:37:27 -0000	1.4
--- CHANGES.current	20 Mar 2003 00:24:47 -0000	1.5
***************
*** 1,5 ****
--- 1,28 ----
  Version 0.3.1 (in progress)
  ===========================
+ 2003-03-19: onsight
+             Changed Enumeration implementation to use std::map<> instead
+ 	    of (non-)std::hash_map<>.
+ 
+ 	    Enumeration __getattr__ in Python now returns new Enum objects 
+ 	    to prevent const subversion (the Enumeration members were
+ 	    mutable from Python).  The logic for __getattr__ is more robust
+ 	    as well.
+ 
+ 	    Added __mul__ and __rmul__ operators to Vector3 and Matrix3
+ 	    to allow: V*V, M*M, V*M, M*V, M*F, F*M, V*F, F*V.
  
+ 	    Optimized Matrix3*Vector3 and Vector3*Matrix3 slightly by
+ 	    using vector members instead of integer indexing (which
+ 	    required nine extra function calls).  Access to the matrix
+ 	    elements is also faster using pointer arithmatic, and the
+ 	    for loops have been unrolled by hand.
+ 
+ 	    Fixed setup.py to preserve file and directory permissions
+ 	    during installation.
+ 
+ 	    Added make_install target to setup.py which is used by the
+ 	    standard Makefile to install SimData (make install).
+ 	    
  2003-03-17: onsight
              Fixes to MS VC.net fixes.  Lather, rinse, repeat... ;-)

Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	19 Feb 2003 11:14:31 -0000	1.4
--- Makefile	20 Mar 2003 00:24:47 -0000	1.5
***************
*** 2,8 ****
  
  export GDEBUGF = -g -Wall
! export GCFLAGS = -fPIC -DUSE_NAMESPACE_SIMDATA -O2 # -march=athlon-tbird
  export GLDOPTS = -shared -lswigpy -ldl
! export GSWOPTS = -c -c++ -python -DUSE_NAMESPACE_SIMDATA -noexcept
  export CXX = g++
  export SWIG = swig 
--- 2,8 ----
  
  export GDEBUGF = -g -Wall
! export GCFLAGS = -fPIC -O2 # -march=athlon-tbird
  export GLDOPTS = -shared -lswigpy -ldl
! export GSWOPTS = -c -c++ -python -noexcept
  export CXX = g++
  export SWIG = swig 
***************
*** 23,24 ****
--- 23,27 ----
  	rm Source/cSimData_wrap.cpp || true;
  	make -C Source all
+ 
+ install:
+ 	python setup.py make_install

Index: README
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** README	18 Mar 2003 10:03:59 -0000	1.3
--- README	20 Mar 2003 00:24:47 -0000	1.4
***************
*** 83,90 ****
  INSTALLING AND USING SIMDATA
  
! Currently you should not do anything to install SimData.  CSPSim expects
! SimData to be in the same relative path as it is in the CVS tree.  This
! situation is not optimal and will change as soon as the DistUtils 
! installer is working.
  
  
--- 83,111 ----
  INSTALLING AND USING SIMDATA
  
! Note that installation under Windows is not yet supported.  This is
! being worked on, and information will be added here as soon as it is
! available.
! 
! Under Linux, depending on which method you used to build SimData, do
! either:
! 
! 
! $ make install
! 
! or 
! 
! $ python setup.py install
! 
! 
! SimData installs itself as a package in the Python site-packages
! directory. The C++ headers are placed under SimData in the same
! directory as Python.h.
! 
! To use the SimData headers for development, just add the usual Python
! include path (e.g. /usr/local/include/python2.2) to your list of include
! paths, and include the header using the prefix "SimData/". For example,
! 
! #include <SimData/Types.h>
! 
  
  

Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** setup.py	18 Mar 2003 10:04:01 -0000	1.1
--- setup.py	20 Mar 2003 00:24:47 -0000	1.2
***************
*** 1,11 ****
  from distutils.core import setup
  from distutils.core import Extension
  import distutils.command.build_ext
  from distutils.command.build_ext import build_ext
! import os, os.path, string
  
  # REMEMBER TO 'touch Version.cpp' OR REBUILD ALL
  VERSION = "\"0.3.1\""
  
  
  class build_swig_ext(build_ext):
--- 1,70 ----
+ # SimDataCSP: Data Infrastructure for Simulations
+ # Copyright (C) 2002 Mark Rose <tm...@st...>
+ # 
+ # This file is part of SimDataCSP.
+ # 
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+ # as published by the Free Software Foundation; either version 2
+ # of the License, or (at your option) any later version.
+ # 
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ # 
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ 
+ 
+ ###
+ # This script has many warts, but should be functional.  It will
+ # be cleaned up in due course....
+ #
+ # -MR
+ 
+ 
  from distutils.core import setup
  from distutils.core import Extension
  import distutils.command.build_ext
  from distutils.command.build_ext import build_ext
! import os, os.path, string, sys
  
  # REMEMBER TO 'touch Version.cpp' OR REBUILD ALL
  VERSION = "\"0.3.1\""
  
+ def copy_dir(src, dst, files):
+     from distutils.file_util import copy_file
+     from distutils.dir_util import mkpath
+     from distutils.errors import DistutilsFileError, DistutilsInternalError
+     from stat import ST_ATIME, ST_MTIME, ST_MODE, S_IMODE
+     if not os.path.isdir(src):
+         raise DistutilsFileError, \
+               "cannot copy dir '%s': not a directory" % src
+     mkpath(dst)
+     st = os.stat(src)
+     os.chmod(dst, S_IMODE(st[ST_MODE]))
+     for n in files:
+         src_name = os.path.join(src, n)
+         dst_name = os.path.join(dst, n)
+         if not os.path.isdir(src_name):
+             copy_file(src_name, dst_name)
+ 
+ def make_install():
+ 	from distutils import sysconfig, dir_util
+ 	lib = sysconfig.get_python_lib()
+ 	inc = sysconfig.get_python_inc()
+ 	modpath = os.path.join(lib, "SimData")
+ 	incpath = os.path.join(inc, "SimData")
+ 	try:
+ 		print "Installing SimData package to", modpath
+ 		copy_dir("SimData", modpath, ['__init__.py', 'Debug.py', 'Parse.py', 'Compile.py', 'cSimData.py', '_cSimData.so'])
+ 		print "Installing SimData headers to", incpath
+ 		copy_dir("Include/SimData", incpath, headers)
+ 	except Exception, e:
+ 		print e
+ 		sys.exit(1)
+ 	sys.exit(0)
  
  class build_swig_ext(build_ext):
***************
*** 153,156 ****
--- 212,216 ----
  	"Types.h",
  	"Vector3.h",
+ 	"Vector3.inl",
  	"Version.h",
  ]
***************
*** 165,176 ****
  sources = fullpath("Source/", ".cpp", sources)
  interfaces = fullpath("Source/", ".i", interfaces)
! headers = fullpath("Include/SimData/", "", headers)
  
! build_swig_ext.options = "-DUSE_NAMESPACE_SIMDATA -IInclude -noexcept"
  includes = ["Include"]
! defines = [("USE_NAMESPACE_SIMDATA", None), ("SIMDATA_VERSION", VERSION)]
  libraries = ["swigpy", "dl"]
  cflags = []
  
  cSimData = Extension("SimData._cSimData", 
                       sources + interfaces, 
--- 225,240 ----
  sources = fullpath("Source/", ".cpp", sources)
  interfaces = fullpath("Source/", ".i", interfaces)
! headers_fullpath = fullpath("Include/SimData/", "", headers)
  
! build_swig_ext.options = "-IInclude -noexcept"
  includes = ["Include"]
! defines = [("SIMDATA_VERSION", VERSION)]
  libraries = ["swigpy", "dl"]
  cflags = []
  
+ 
+ if len(sys.argv)==2 and sys.argv[1]=="make_install":
+ 	make_install()
+ 
  cSimData = Extension("SimData._cSimData", 
                       sources + interfaces, 
***************
*** 188,192 ****
        url="http://csp.sourceforge.net/wiki/",
        packages=['SimData'],
! 	  headers = headers,
  	  ext_modules = [cSimData],
  	  )
--- 252,256 ----
        url="http://csp.sourceforge.net/wiki/",
        packages=['SimData'],
! 	  headers = headers_fullpath,
  	  ext_modules = [cSimData],
  	  )

[Csp-commits] APPLICATIONS/SimData/Include/SimData Path.h,1.7,1.8

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv30817/Include/SimData

Modified Files:
	Path.h 
Log Message:


Index: Path.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Path.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Path.h	18 Mar 2003 10:04:02 -0000	1.7
--- Path.h	18 Mar 2003 11:24:47 -0000	1.8
***************
*** 343,347 ****
  	 */
  	bool operator==(PointerBase const &p) const {
! 		return PointerBase::operator==(p);
  	}
  
--- 343,347 ----
  	 */
  	bool operator==(PointerBase const &p) const {
! 		return ReferencePointer::operator==(p);
  	}
  

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.3,1.4

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv3932

Modified Files:
	CHANGES.current 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CHANGES.current	18 Mar 2003 10:03:59 -0000	1.3
--- CHANGES.current	18 Mar 2003 10:37:27 -0000	1.4
***************
*** 46,49 ****
--- 46,52 ----
              LOG_WARN, LOG_ALERT, LOG_ERROR). The msg field can include the
              usual ostream operators (<<).
+ 	    
+             *** BUILD CHANGE ***
+ 	    Added Source/LogStream.cpp to do logging.
  
  	    *** NEW FEATURE ***

[Csp-commits] APPLICATIONS/SimData setup.py,NONE,1.1 CHANGES.current,1.2,1.3 README,1.2,1.3

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv11687

Modified Files:
	CHANGES.current README 
Added Files:
	setup.py 
Log Message:
see CHANGES.current

--- NEW FILE: setup.py ---
from distutils.core import setup
from distutils.core import Extension
import distutils.command.build_ext
from distutils.command.build_ext import build_ext
import os, os.path, string

# REMEMBER TO 'touch Version.cpp' OR REBUILD ALL
VERSION = "\"0.3.1\""


class build_swig_ext(build_ext):
	
	swig_options = ''

	def build_extension(self, ext):
		self.ext = ext
		build_ext.build_extension(self, ext)
		
	def swig_sources (self, sources):

		"""Walk the list of source files in 'sources', looking for SWIG
		interface (.i) files.  Run SWIG on all that are found, and
		return a modified 'sources' list with SWIG source files replaced
		by the generated C (or C++) files.
		"""

		new_sources = []
		swig_sources = []
		swig_targets = {}

		# XXX this drops generated C/C++ files into the source tree, which
		# is fine for developers who want to distribute the generated
		# source -- but there should be an option to put SWIG output in
		# the temp dir.

		self.swig_cpp = 1

		if self.swig_cpp:
			target_ext = '.cpp'
		else:
			target_ext = '.c'

		for source in sources:
			(base, ext) = os.path.splitext(source)
			if ext == ".i":             # SWIG interface file
				new_sources.append(base + target_ext)
				swig_sources.append(source)
				swig_targets[source] = new_sources[-1]
			else:
				new_sources.append(source)

		if not swig_sources:
			return new_sources

		swig = self.find_swig()
		swig_cmd = [swig, "-python", "-c++"] + build_swig_ext.options.split()
		
		if 1 or self.inplace:
			fullname = self.get_ext_fullname(self.ext.name)
			modpath = string.split(fullname, '.')
			package = string.join(modpath[0:-1], '.')
			base = modpath[-1]
			build_py = self.get_finalized_command('build_py')
			package_dir = build_py.get_package_dir(package)
		else:
			package_dir = self.build_lib

		for source in swig_sources:
			target = swig_targets[source]
			self.announce("swigging %s to %s" % (source, target))
			self.spawn(swig_cmd + ["-o", target, source])
			(base, ext) = os.path.splitext(source)
			proxy_full = base + '.py'
			proxy = os.path.basename(proxy_full)
			proxy_lib = os.path.join(self.build_lib, os.path.join(package_dir, proxy))
			print proxy_full, "=>", proxy_lib
			os.rename(proxy_full, proxy_lib)

		return new_sources

orig_build_ext = build_ext
distutils.command.build_ext.build_ext = build_swig_ext

if os.name == "posix":
	# changes the compiler from gcc to g++
	from distutils import sysconfig
	save_init_posix = sysconfig._init_posix
	def gpp_init_posix():
		print 'gpp_init_posix: changing gcc to g++'
		save_init_posix()
		g = sysconfig._config_vars
		g['CC'] = 'g++'
		g['LDSHARED'] = 'g++ -shared'
	sysconfig._init_posix = gpp_init_posix

sources = [
	"BaseType",
	"DataArchive",
	"Date",
	"Enum",
	"Exception",
	"External",
	"GeoPos",
	"HashUtility",
	"InterfaceRegistry",
	"Interpolate",
	"List",
	"LogStream",
	"Math",
	"Matrix3",
	"Object",
	"Pack",
	"Path",
	"Quaternion",
	"Random",
	"Spread",
	"TypeAdapter",
	"Vector3",
	"Version",
]

headers = [
	"BaseType.h",
	"DataArchive.h",
	"Date.h",
	"Enum.h",
	"Exception.h",
	"Export.h",
	"External.h",
	"GeoPos.h",
	"GlibCsp.h",
	"hash_map.h",
	"HashUtility.h",
	"Integer.h",
	"InterfaceRegistry.h",
	"Interpolate.h",
	"List.h",
	"Log.h",
	"LogStream.h",
	"Math.h",
	"Matrix3.h",
	"ns-simdata.h",
	"Object.h",
	"ObjectInterface.h",
	"Pack.h",
	"Path.h",
	"Quaternion.h",
	"Random.h",
	"Real.h",
	"Spread.h",
	"String.h",
	"TypeAdapter.h",
	"Types.h",
	"Vector3.h",
	"Version.h",
]

interfaces = [
	"cSimData"
]

def fullpath(path, ext, list):
	return map(lambda x: path+x+ext, list)

sources = fullpath("Source/", ".cpp", sources)
interfaces = fullpath("Source/", ".i", interfaces)
headers = fullpath("Include/SimData/", "", headers)

build_swig_ext.options = "-DUSE_NAMESPACE_SIMDATA -IInclude -noexcept"
includes = ["Include"]
defines = [("USE_NAMESPACE_SIMDATA", None), ("SIMDATA_VERSION", VERSION)]
libraries = ["swigpy", "dl"]
cflags = []

cSimData = Extension("SimData._cSimData", 
                     sources + interfaces, 
					 include_dirs = includes,
					 define_macros = defines,
					 libraries = libraries, 
					 extra_compile_args = cflags,
					 )

setup(name="SimData",
      version=VERSION,
	  description="Simulation Data Abstraction Library",
      author="Mark Rose",
      author_email="mr...@st...",
      url="http://csp.sourceforge.net/wiki/",
      packages=['SimData'],
	  headers = headers,
	  ext_modules = [cSimData],
	  )



Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CHANGES.current	15 Mar 2003 02:26:43 -0000	1.2
--- CHANGES.current	18 Mar 2003 10:03:59 -0000	1.3
***************
*** 2,5 ****
--- 2,35 ----
  ===========================
  
+ 2003-03-17: onsight
+             Fixes to MS VC.net fixes.  Lather, rinse, repeat... ;-)
+ 	    
+ 2003-03-17: delta
+             Fixes for building with MS VC.Net
+ 
+ 2003-03-16: onsight
+             Created a new setup.py script to allow SimData to be build and
+             installed using Python DistUtils. This works on Linux/GCC but
+             needs to be tested on other platforms. The Makefile will remain
+             as a backup until the setup.py script is stable.
+ 
+             Restructured the installation as a SimData packages, with the
+             extension module (cSimData) and tools (DataCompiler) underneath.
+             SimData/__init__.py now contains the code that was in
+             SimData.py. The net effect is that you just import SimData as
+             usual, but the data compiler is now SimData.Compiler. I'm moving
+             away from a standalone compiler approach, since it depends on
+             the external library that you are compiling for. Instead, the
+             external program should load SimData, register its object
+             interfaces, and run the compiler if needed by creating an
+             instance of class Compile (from SimData.Compiler).
+ 
+             Restructured the argument processing and usage messages of
+             Compiler.Compile to interact better with the calling code (when
+             not used as a standalone compiler). The main application should
+             process any command line arguments it recognizes and pass the
+             rest to Compile.parse(), catching any exceptions that are
+             raised.
+            
  2003-03-13: onsight
              Fixed several bugs related to std::vector types
***************
*** 17,20 ****
--- 47,52 ----
              usual ostream operators (<<).
  
+ 	    *** NEW FEATURE ***
+             *** POTENTIAL INCOMPATIBILITY ***
              Added a new postCreate() method in Object which is called after
              unpack() is complete. You can extend this to do additional
***************
*** 22,25 ****
--- 54,58 ----
              be the exact inverse operation of pack().
  
+ 	    *** NEW FEATURE ***
              Data compiler enhancements, mainly the ability to only reparse
              xml files that have changed since the archive was last
***************
*** 28,31 ****
--- 61,65 ----
              entire archive from scratch.
  
+             *** POTENTIAL INCOMPATIBILITY ***
              Big simplification of the various smart pointer types.
              PathPointer<T> is gone; now just use Pointer<T> for all object

Index: README
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README	28 Jan 2003 23:26:04 -0000	1.2
--- README	18 Mar 2003 10:03:59 -0000	1.3
***************
*** 11,112 ****
  CAVEATS
  
! This library is ALPHA!  Do not expect it to be polished in any way.
! It does work, at least under the proper conditions, which is why it
! has been released.  Only through testing and use will it evolve into
! a robust and stable platform for utilizing XML data in simulations.
  
  SimData is written primarily for the Combat Simulator Project (CSP)
! <http://csp.sourceforge.net>.   It is, nonetheless, intended to be
! a fully independent library that can be used with any application
! desiring fast runtime axis to large, static XML data sets.
  
! SimData was developed entirely under Linux using GCC 2.95 and 3.0.
! It is intended to compile with other versions of GCC and under other
! the Windows operating system, but this has not been tested and I
! expect there will be some initial incompatibilities.  If you
! encounter problems, please report them (with patches if possible) to 
! the CSP developer's forum at http://csp.sourceforge.net/forum.
  
  
  
! PRE-BUILDING
  
! There are Makefiles for Linux/GCC, but no build system for other
! platforms.  I'm relying on users of such platforms to provide build
! scripts using the Linux Makefiles as a starting point.  These will
! be included in CVS as soon as they are available.
  
! On Linux, edit the top level Makefile to customize any settings
! to your particular system.  The path to the Python headers is an
! example of a parameter you might want to check.  Eventually I'll
! make some autoconf scripts to handle this step automatically.
  
- You will need both SWIG and Python in order to utilize SimData.
- While it may be technically possible to build SimData without
- these tools, the Data Compiler (which is essential to the use
- of SimData) is currently written in Python and relies on the 
- SWIG-wrapped interface to SimData, so there is little point in
- building SimData without these.  
  
! Python can be obtained in a number of convenient installation 
! packages from sources listed at http://www.python.org.  Be sure 
! to use Python 2.2 or higher. It may work with Python 2.1 but I 
! make no guarantees.
  
! For SWIG, version 1.3.16 or higher is recommended.  SWIG can
! be downloaded as source or binary from http://www.swig.org.
  
  
! BUILDING
  
! Just run make in the top-level directory.  If all goes well
! this will create _cSimData.so and libSimData.a in the Source
! directory.  
  
  
- TESTING
  
! As a quick test, change to the Source directory and run Python.  
! Try typing "import SimData".  You should see a line similar to 
! "loaded @ 0x4883012".  If not, something went wrong... post to 
! the CSP developer's forum and we can try to find the problem.
  
  
- USING SIMDATA WITH CSPSIM
  
! The new CSP application called CSPSim relies on SimData in
! two ways.  First, libSimData.a is statically linked to make
! the CSPSim executable.  Second, the simulation data for CSPSim
! needs to be compiled from XML source files to a binary data 
! archive using the data compiler application included with
! SimData.  This Python program is found in the directory
! Tools/DataCompiler.  Once you have built your CSPSim executable,
! go to Tools/DataCompiler and run Compiler.py (from a command
! prompt on windows you would probably need to type something like
! "python Compiler.py").  If the Compiler can't find CSPSim
! initially, it will prompt you to enter a path to CSPSim.  This
! path is saved in a file named .csp_path so you shouldn't have
! to do this more than once.  The Compiler will then print a
! usage message and exit.  To compile the data for CSPSim, you
! must specify the top level data directory to archive, and the
! name of the output archive.  Given the standard location of
! the files in CVS, you would type:
  
! ./Compiler.py ../../../CSPSim/Data/Sim ../../../CSPSim/Data/Sim.dar
  
- This will parse all the XML files under CSPSim/Data/Sim and create
- the a binary archive (named Sim.dar) needed to run CSPSim.  A
- script named "make_simdar" that runs the above command is provided 
- for your convienience.  This must be rerun whenever you modify
- the XML data files to incorporate the changes into Sim.dar.
  
  
- BUILDING on Windows with msvc++6(sp5), stlport-4.5.3 (hints)
  
- 1) Install python2.2 and swig 1.3.17
- 2) Add python path to your global path
- 3) Load SimDataMSVC.dsw
- 4) Build it in release mode; in process, it should create a new file
- called cSimData_wrap.cpp (this file name should already be in
- project/Source) from cSimData.i which is parsed by swig.
- 5) Testing procedure is same as above.
\ No newline at end of file
--- 11,90 ----
  CAVEATS
  
! This library is ALPHA! Do not expect it to be polished in any way. It
! does work, at least under the proper conditions, which is why it has
! been released. Only through testing and use will it evolve into a robust
! and stable platform for utilizing XML data in simulations.
  
  SimData is written primarily for the Combat Simulator Project (CSP)
! <http://csp.sourceforge.net>. It is, nonetheless, intended to be a fully
! independent library that can be used with any application desiring fast
! runtime access to large, static XML data sets.
  
! SimData was initially developed under Linux using GCC 2.95 and 3.0.
! Current development occurs mainly under GCC 3.2. The library also
! receives routine testing under MS VC6 and now .NET as part of the Combat
! Simulator Project. If you encounter problems, please report them (with
! patches if possible) to the CSP developer's forum at
! http://csp.sourceforge.net/forum.
  
  
+ REQUIREMENTS
  
! Minimally, SimData can operate as a standalone library that provides
! a number of C++ data classes useful for simulations.  In this mode
! there are no external dependencies.
  
! To use the XML interface and data archiving features, however, requires
! both SWIG and Python.  SWIG is available from http://www.swig.org, and
! should be version 1.3.16 or newer.  Python is preinstalled on many
! Linux systems, and prepackaged distributions for both Windows and
! Linux are available from http://www.python.org.  Python version 2.2 or
! newer is required.  Under Windows, be sure to add the Python path to 
! your global path so that VC can find it.
  
! If you are using MS VC6 you will also need have at least SP5 installed
! and a functional STL implementation, such as STLport (version 4.5.3 or
! newer).
  
  
! BUILDING: ANNOUNCEMENT
  
! The build process is currently depends on Makefiles (Linux) and VC
! project files (Windows), but will likely transition to Python's
! DistUtils soon.  Stay tuned....
  
  
! BUILDING: LINUX
  
! On Linux, edit the top level Makefile to customize any settings to your
! particular system. The path to the Python headers is an example of a
! parameter you might want to check.
  
+ Next, just run make in the top-level directory. If all goes well this
+ will create cSimData.py, _cSimData.so, and libSimData.a in the Source
+ directory.
  
  
! BUILDING: VC6/.NET
  
+ Load SimDataMSVC.dsw and build it in release mode. In the process, it
+ should create a new file called cSimData_wrap.cpp (this file name should
+ already be in project/Source) from cSimData.i which is parsed by SWIG.
  
  
! TESTING
  
! As a quick test, change to the Source directory and run Python. Try
! typing "import SimData". You should see a line similar to "loaded @
! 0x4883012". If not, something went wrong... post to the CSP developer's
! forum and we can try to find the problem.
  
  
+ INSTALLING AND USING SIMDATA
+ 
+ Currently you should not do anything to install SimData.  CSPSim expects
+ SimData to be in the same relative path as it is in the CVS tree.  This
+ situation is not optimal and will change as soon as the DistUtils 
+ installer is working.
  
  

[Csp-commits] APPLICATIONS/SimData/Tools/DataCompiler Compile.py,1.3,1.4 Parse.py,1.3,1.4 make_simdar,1.2,1.3

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Tools/DataCompiler
In directory sc8-pr-cvs1:/tmp/cvs-serv11687/Tools/DataCompiler

Modified Files:
	Compile.py Parse.py make_simdar 
Log Message:
see CHANGES.current

Index: Compile.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Tools/DataCompiler/Compile.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Compile.py	10 Feb 2003 05:11:44 -0000	1.3
--- Compile.py	18 Mar 2003 10:04:06 -0000	1.4
***************
*** 37,40 ****
--- 37,41 ----
  		print "http://csp.sourcforge.net/forum"
  		sys.exit(1)
+ 	SimData.log().setLogLevels(SimData.LOG_ALL, SimData.LOG_ALERT)
  	original_path = sys.path[:]
  	new_path = ""
***************
*** 75,79 ****
--- 76,124 ----
  import os.path, time
  
+ class Cache:
+ 	def __init__(self, fn):
+ 		self.timestamp = None
+ 		self.source = None
+ 		if os.path.exists(fn):
+ 			try:
+ 			    # open archive for reading, but disable chaining
+ 				self.source = DataArchive(fn, 1, 0)
+ 				self.timestamp = os.path.getmtime(fn)
+ 			except:
+ 				self.source = None
+ 				self.timestamp = None
+ 
+ 	def close(self):
+ 		self.source = None
+ 
+ 	def getObject(self, id):
+ 		if self.source is not None:
+ 			try:
+ 				return self.source.getObject(id)
+ 			except:
+ 				pass
+ 		return None
  
+ 	def isNewer(self, fn):
+ 		if self.timestamp is None: 
+ 			return 1
+ 		try:
+ 			mtime = os.path.getmtime(fn)
+ 		except:
+ 			return 1
+ 		return mtime > self.timestamp
+ 
+ 
+ class CompilerUsageError:
+ 	def __init__(self, msg=None):
+ 		self.msg = msg
+ 	def getMessage(self):
+ 		if self.msg is None:
+ 			return "Usage error"
+ 		return "Usage error: %s\n" % self.msg
+ 	def __repr__(self):
+ 		return self.getMessage()
+ 		
+ 		
  class Compiler:
  
***************
*** 81,93 ****
  		print
  		print "Compiling '%s' from '%s'" % (self.outfile, self.infile)
! 		print "Opening output archive"
! 		compiled = DataArchive(self.outfile, 0)
! 		print "Opening input archive"
  		master = ObjectXMLArchive(self.infile);
! 		print "Loading all objects"
  		resetWarnings()
  		all = master.loadAll()
  		warnings, level = getWarnings()
! 		print "XML parse completed."
  		if warnings > 0:
  			print "%d warnings (severity=%d)." % (warnings, level)
--- 126,141 ----
  		print
  		print "Compiling '%s' from '%s'" % (self.outfile, self.infile)
! 		DEBUG(1, "Opening input archive")
  		master = ObjectXMLArchive(self.infile);
! 		DEBUG(1, "Loading all objects")
  		resetWarnings()
+ 		if not self.rebuild:
+ 			cache = Cache(self.outfile)
+ 			master.setCache(cache)
  		all = master.loadAll()
+ 		if not self.rebuild:
+ 			cache.close()
  		warnings, level = getWarnings()
! 		DEBUG(1, "XML parse completed.")
  		if warnings > 0:
  			print "%d warnings (severity=%d)." % (warnings, level)
***************
*** 97,104 ****
  				sys.exit(1)
  		paths = master.getPaths()
! 		print "Compiling all objects"
  		for id in all.keys():
  			object = all[id]
  			DEBUG(2, "Compiling object '%s' [%s] %s" % (id, hash_string(id), str(object)))
  			compiled.addObject(object, id)
  		self.dumpBadPaths(all, paths)
--- 145,159 ----
  				sys.exit(1)
  		paths = master.getPaths()
! 		DEBUG(1,"Compiling all objects")
! 		compiled = DataArchive(self.outfile, 0)
  		for id in all.keys():
  			object = all[id]
  			DEBUG(2, "Compiling object '%s' [%s] %s" % (id, hash_string(id), str(object)))
+ 			# objects cached from the original archive are Pointers, so we need to
+ 			# dereference them.  this should be cleaned up a bit.
+ 			try:
+ 				object = object.__get__()
+ 			except:
+ 				pass
  			compiled.addObject(object, id)
  		self.dumpBadPaths(all, paths)
***************
*** 119,143 ****
  			print
  			
  	def usage(self, msg=None):
! 		print
! 		if msg is not None:
! 			print "Usage error:", msg
! 		print "SimData XML Compiler"
! 		print self._name, "[--warn=level] [--debug=level] sourcepath output"
! 		sys.exit(1)
! 		
  	def parse(self, args):
  		args = args[1:]
  		for arg in args:
  			if arg.startswith('--'):
  				try:
  					if arg.startswith('--warn='):
! 						setWarningLevel(int(arg[7:]))
  					elif arg.startswith('--debug='):
! 						setDebugLevel(int(arg[8:]))
  					else:
! 						self.usage("unknown option '%s'" % arg)
  				except:
! 						self.usage("invalid option '%s'" % arg)
  			else:
  				if self.infile is None:
--- 174,222 ----
  			print
  			
+ 	def printUsage(self, out=sys.stdout):
+ 		print >>out, "SimData XML Compiler"
+ 		if self.standalone:
+ 			print >>out, self._name, "[--warn=level] [--debug=level] [--rebuild] sourcepath output"
+ 		else:
+ 			print >>out, ""
+ 			print >>out, "  Options:"
+ 			print >>out, "              --warn=level     show warning message (< level)"
+ 			print >>out, "              --debug=level    show debug messages (< level)"
+ 			print >>out, "              --rebuild        rebuild entire archive"
+ 
  	def usage(self, msg=None):
! 		if self.standalone:
! 			if msg is not None:
! 				print "Usage error:", msg
! 			self.printUsage()
! 			sys.exit(1)
! 		else:
! 			raise CompilerUsageError(msg)
! 			
  	def parse(self, args):
+ 		self._name = args[0]
  		args = args[1:]
  		for arg in args:
  			if arg.startswith('--'):
  				try:
+ 					unknown = 0
  					if arg.startswith('--warn='):
! 						level = int(arg[7:])
! 						setWarningLevel(level)
! 						if level > 0:
! 							SimData.log().setLogLevels(SimData.LOG_ALL, SimData.LOG_WARN)
  					elif arg.startswith('--debug='):
! 						level = int(arg[8:])
! 						setDebugLevel(level)
! 						if level > 0:
! 							SimData.log().setLogLevels(SimData.LOG_ALL, SimData.LOG_DEBUG)
! 					elif arg == '--rebuild':
! 						self.rebuild = 1
  					else:
! 						unknown = 1
  				except:
! 					self.usage("invalid option '%s'" % arg)
! 				if unknown:
! 					self.usage("unknown option '%s'" % arg)
  			else:
  				if self.infile is None:
***************
*** 150,163 ****
  			self.usage()
  					
! 	def __init__(self, args):
  		setWarningLevel(1)
  		self.infile = None
  		self.outfile = None
! 		self._name = args[0]
! 		self.parse(args)
! 		self.compileAll()
  
  if __name__ == "__main__":
! 	import profile
! 	profile.run('Compiler(sys.argv)', 'profile.out')
  
--- 229,243 ----
  			self.usage()
  					
! 	def __init__(self, standalone=0):
  		setWarningLevel(1)
+ 		self.rebuild = 0
  		self.infile = None
  		self.outfile = None
! 		self._name = ""
! 		self.standalone = standalone
  
  if __name__ == "__main__":
! 	c = Compiler(1)
! 	c.parse(sys.argv)
! 	c.compileAll()
  

Index: Parse.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Tools/DataCompiler/Parse.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Parse.py	10 Feb 2003 05:11:44 -0000	1.3
--- Parse.py	18 Mar 2003 10:04:06 -0000	1.4
***************
*** 385,389 ****
  
  	def getElement(self):
! 		p = SimData.PathPointer()
  		p.setPath(self._element.encode('ascii'))
  		return p
--- 385,389 ----
  
  	def getElement(self):
! 		p = SimData.PointerBase()
  		p.setPath(self._element.encode('ascii'))
  		return p
***************
*** 585,594 ****
  			print "  ", "\n  ".join(interface_names)
  			raise NameError, msg
! 		try:
  			obj = self._interface.createObject()
! 		except:
! 			print "ERROR Creating class", self._class
! 			msg = "ERROR Creating class %s" % self._class
! 			raise msg
  		self._object = obj
  		self._assigned = {}
--- 585,597 ----
  			print "  ", "\n  ".join(interface_names)
  			raise NameError, msg
! 		if getDebugLevel() > 0:
  			obj = self._interface.createObject()
! 		else:
! 			try:
! 				obj = self._interface.createObject()
! 			except:
! 				print "ERROR Creating class", self._class
! 				msg = "ERROR Creating class %s" % self._class
! 				raise msg
  		self._object = obj
  		self._assigned = {}
***************
*** 604,607 ****
--- 607,611 ----
  		self._assigned[name] = 1
  		self._handler.assign(self._interface, self._object, name)
+ 		#print name, self._handler.getElement()
  		self.checkName(name)
  
***************
*** 646,649 ****
--- 650,654 ----
  		self._paths = {}
  		self._externals = {}
+ 		self._cache = None
  
  	def getObject(self, id):
***************
*** 664,667 ****
--- 669,676 ----
  				if not os.path.exists(path):
  					raise IOError, "Unable to find data for %s" % id
+ 		if self._cache and not self._cache.isNewer(path):
+ 			obj = self._cache.getObject(id)
+ 			if obj is not None:
+ 				return obj
  		if path.endswith('.gz'):
  			f = GzipFile(path, "rb")
***************
*** 710,713 ****
--- 719,725 ----
  	def getExternals(self):
  		return self._externals
+ 
+ 	def setCache(self, cache):
+ 		self._cache = cache
  
  	def loadAll(self, path = ""):

Index: make_simdar
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Tools/DataCompiler/make_simdar,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** make_simdar	28 Jan 2003 23:26:09 -0000	1.2
--- make_simdar	18 Mar 2003 10:04:06 -0000	1.3
***************
*** 1 ****
! ./Compile.py ../../../CSPSim/Data/XML ../../../CSPSim/Data/Sim.dar
--- 1 ----
! ./Compile.py $* ../../../CSPSim/Data/XML ../../../CSPSim/Data/Sim.dar

[Csp-commits] APPLICATIONS/SimData/SimData - New directory

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv8854/SimData

Log Message:
Directory /cvsroot/csp/APPLICATIONS/SimData/SimData added to the repository

[Csp-commits] APPLICATIONS/SimData/VisualStudio SimData.vcproj,NONE,1.1 SimData.sln,NONE,1.1

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio
In directory sc8-pr-cvs1:/tmp/cvs-serv4677

Added Files:
	SimData.vcproj SimData.sln 
Log Message:
Adding vc++7 project files. Plz, tell me if it needs others configuration files.

--- NEW FILE: SimData.vcproj ---
<?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.00"
	Name="SimData"
	SccProjectName=""
	SccLocalPath="">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Release|Win32"
			OutputDirectory=".\Release"
			IntermediateDirectory=".\Release"
			ConfigurationType="2"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="FALSE"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				InlineFunctionExpansion="1"
				AdditionalIncludeDirectories="../Include,C:/Python22/include"
				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SIMDATA_EXPORTS"
				StringPooling="TRUE"
				RuntimeLibrary="2"
				EnableFunctionLevelLinking="TRUE"
				RuntimeTypeInfo="TRUE"
				PrecompiledHeaderFile=".\Release/SimData.pch"
				AssemblerListingLocation=".\Release/"
				ObjectFile=".\Release/"
				ProgramDataBaseFileName=".\Release/"
				WarningLevel="3"
				SuppressStartupBanner="TRUE"
				CompileAs="0"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalOptions="/MACHINE:I386"
				AdditionalDependencies="odbc32.lib odbccp32.lib"
				OutputFile="Release/_cSimData.dll"
				LinkIncremental="1"
				SuppressStartupBanner="TRUE"
				AdditionalLibraryDirectories="C:/Python22/libs"
				ProgramDatabaseFile=".\Release/_cSimData.pdb"
				ImportLibrary=".\Release/_cSimData.lib"/>
			<Tool
				Name="VCMIDLTool"
				PreprocessorDefinitions="NDEBUG"
				MkTypLibCompatible="TRUE"
				SuppressStartupBanner="TRUE"
				TargetEnvironment="1"
				TypeLibraryName=".\Release/SimData.tlb"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="NDEBUG"
				Culture="1036"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
		</Configuration>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory=".\Debug"
			IntermediateDirectory=".\Debug"
			ConfigurationType="2"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="FALSE"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="../Include,C:/Python22/include"
				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SIMDATA_EXPORTS"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				RuntimeTypeInfo="TRUE"
				PrecompiledHeaderFile=".\Debug/SimData.pch"
				AssemblerListingLocation=".\Debug/"
				ObjectFile=".\Debug/"
				ProgramDataBaseFileName=".\Debug/"
				WarningLevel="3"
				SuppressStartupBanner="TRUE"
				DebugInformationFormat="4"
				CompileAs="0"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalOptions="/MACHINE:I386"
				AdditionalDependencies="odbc32.lib odbccp32.lib"
				OutputFile="Debug/_cSimDatad.dll"
				LinkIncremental="2"
				SuppressStartupBanner="TRUE"
				AdditionalLibraryDirectories="C:/Python22/libs"
				GenerateDebugInformation="TRUE"
				ProgramDatabaseFile=".\Debug/_cSimDatad.pdb"
				ImportLibrary=".\Debug/_cSimDatad.lib"/>
			<Tool
				Name="VCMIDLTool"
				PreprocessorDefinitions="_DEBUG"
				MkTypLibCompatible="TRUE"
				SuppressStartupBanner="TRUE"
				TargetEnvironment="1"
				TypeLibraryName=".\Debug/SimData.tlb"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="_DEBUG"
				Culture="1036"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
		</Configuration>
	</Configurations>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
			<File
				RelativePath="..\Source\BaseType.cpp">
			</File>
			<File
				RelativePath="..\Source\DataArchive.cpp">
			</File>
			<File
				RelativePath="..\Source\Date.cpp">
			</File>
			<File
				RelativePath="..\Source\Enum.cpp">
			</File>
			<File
				RelativePath="..\Source\Exception.cpp">
			</File>
			<File
				RelativePath="..\Source\External.cpp">
			</File>
			<File
				RelativePath="..\Source\GeoPos.cpp">
			</File>
			<File
				RelativePath="..\Source\HashUtility.cpp">
			</File>
			<File
				RelativePath="..\Source\InterfaceRegistry.cpp">
			</File>
			<File
				RelativePath="..\Source\Interpolate.cpp">
			</File>
			<File
				RelativePath="..\Source\List.cpp">
			</File>
			<File
				RelativePath="..\Source\Math.cpp">
			</File>
			<File
				RelativePath="..\Source\Matrix3.cpp">
			</File>
			<File
				RelativePath="..\Source\Object.cpp">
			</File>
			<File
				RelativePath="..\Source\Pack.cpp">
			</File>
			<File
				RelativePath="..\Source\Path.cpp">
			</File>
			<File
				RelativePath="..\Source\Quaternion.cpp">
			</File>
			<File
				RelativePath="..\Source\Random.cpp">
			</File>
			<File
				RelativePath="..\Source\Spread.cpp">
			</File>
			<File
				RelativePath="..\Source\TypeAdapter.cpp">
			</File>
			<File
				RelativePath="..\Source\Vector3.cpp">
			</File>
			<File
				RelativePath="..\Source\Version.cpp">
			</File>
			<File
				RelativePath="..\Source\cSimData_wrap.cpp">
			</File>
			<File
				RelativePath="..\Source\main.cpp">
				<FileConfiguration
					Name="Release|Win32"
					ExcludedFromBuild="TRUE">
					<Tool
						Name="VCCLCompilerTool"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32"
					ExcludedFromBuild="TRUE">
					<Tool
						Name="VCCLCompilerTool"/>
				</FileConfiguration>
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl">
			<File
				RelativePath="..\Include\SimData\BaseType.h">
			</File>
			<File
				RelativePath="..\Include\SimData\DataArchive.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Date.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Enum.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Exception.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Export.h">
			</File>
			<File
				RelativePath="..\Include\SimData\External.h">
			</File>
			<File
				RelativePath="..\Include\SimData\GlibCsp.h">
			</File>
			<File
				RelativePath="..\Include\SimData\HashUtility.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Integer.h">
			</File>
			<File
				RelativePath="..\Include\SimData\InterfaceRegistry.h">
			</File>
			<File
				RelativePath="..\Include\SimData\InterfaceRegistry_wrap.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Interpolate.h">
			</File>
			<File
				RelativePath="..\Include\SimData\List.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Math.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Matrix3.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Object.h">
			</File>
			<File
				RelativePath="..\Include\SimData\ObjectInterface.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Pack.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Path.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Quaternion.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Random.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Real.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Spread.h">
			</File>
			<File
				RelativePath="..\Include\SimData\String.h">
			</File>
			<File
				RelativePath="..\Include\SimData\TypeAdapter.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Types.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Vector3.h">
			</File>
			<File
				RelativePath="..\Include\SimData\Vector3.inl">
			</File>
			<File
				RelativePath="..\Include\SimData\hash_map.h">
			</File>
			<File
				RelativePath="..\Include\SimData\ns-simdata.h">
			</File>
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
		</Filter>
		<File
			RelativePath="..\Source\cSimData.i">
			<FileConfiguration
				Name="Release|Win32">
				<Tool
					Name="VCCustomBuildTool"
					CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i"
					Outputs="..\Source\$(InputName)_wrap.cpp"/>
			</FileConfiguration>
			<FileConfiguration
				Name="Debug|Win32">
				<Tool
					Name="VCCustomBuildTool"
					CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i
"
					Outputs="..\Source\$(InputName)_wrap.cpp"/>
			</FileConfiguration>
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

--- NEW FILE: SimData.sln ---
Microsoft Visual Studio Solution File, Format Version 7.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimData", "SimData.vcproj", "{F9948756-70B5-4328-8A6A-F4BE5A521A27}"
EndProject
Global
	GlobalSection(SolutionConfiguration) = preSolution
		ConfigName.0 = Debug
		ConfigName.1 = Release
	EndGlobalSection
	GlobalSection(ProjectDependencies) = postSolution
	EndGlobalSection
	GlobalSection(ProjectConfiguration) = postSolution
		{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Debug.ActiveCfg = Release|Win32
		{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Debug.Build.0 = Release|Win32
		{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Release.ActiveCfg = Release|Win32
		{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Release.Build.0 = Release|Win32
	EndGlobalSection
	GlobalSection(ExtensibilityGlobals) = postSolution
	EndGlobalSection
	GlobalSection(ExtensibilityAddIns) = postSolution
	EndGlobalSection
EndGlobal

[Csp-commits] APPLICATIONS/SimData/VisualStudio SimData.dsp,1.2,1.3

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio
In directory sc8-pr-cvs1:/tmp/cvs-serv4201

Modified Files:
	SimData.dsp 
Log Message:
no message

Index: SimData.dsp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/VisualStudio/SimData.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SimData.dsp	3 Feb 2003 19:11:53 -0000	1.2
--- SimData.dsp	18 Mar 2003 06:42:29 -0000	1.3
***************
*** 123,126 ****
--- 123,130 ----
  # Begin Source File
  
+ SOURCE=..\Source\GeoPos.cpp
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=..\Source\HashUtility.cpp
  # End Source File
***************
*** 180,183 ****
--- 184,191 ----
  
  SOURCE=..\Source\Vector3.cpp
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\Source\Version.cpp
  # End Source File
  # End Group

[Csp-commits] APPLICATIONS/SimData/Source BaseType.cpp,1.2,1.3 Enum.cpp,1.2,1.3 HashUtility.cpp,1.2,1.3 Math.cpp,1.2,1.3 Vector3.cpp,1.2,1.3

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv4000

Modified Files:
	BaseType.cpp Enum.cpp HashUtility.cpp Math.cpp Vector3.cpp 
Log Message:
no message

Index: BaseType.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/BaseType.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BaseType.cpp	28 Jan 2003 23:26:07 -0000	1.2
--- BaseType.cpp	18 Mar 2003 06:41:49 -0000	1.3
***************
*** 19,24 ****
   */
  
- #include <SimData/BaseType.h>
  #include <string>
  
  NAMESPACE_SIMDATA
--- 19,26 ----
   */
  
  #include <string>
+ 
+ #include <SimData/BaseType.h>
+ 
  
  NAMESPACE_SIMDATA

Index: Enum.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Enum.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Enum.cpp	28 Jan 2003 23:26:07 -0000	1.2
--- Enum.cpp	18 Mar 2003 06:41:49 -0000	1.3
***************
*** 10,13 ****
--- 10,14 ----
   */
  
+ 
  // class Enum
  

Index: HashUtility.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/HashUtility.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HashUtility.cpp	28 Jan 2003 23:26:07 -0000	1.2
--- HashUtility.cpp	18 Mar 2003 06:41:49 -0000	1.3
***************
*** 26,36 ****
   *
   */
  
  #include <SimData/HashUtility.h>
! #include <sstream>
  
  
  NAMESPACE_SIMDATA
  
  
  /* The mixing step */
--- 26,39 ----
   *
   */
+ #include <sstream>
  
+ #include <Simdata/Export.h>
  #include <SimData/HashUtility.h>
! 
  
  
  NAMESPACE_SIMDATA
  
+ HASH<const char*> hashstring::h;
  
  /* The mixing step */

Index: Math.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Math.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Math.cpp	28 Jan 2003 23:26:07 -0000	1.2
--- Math.cpp	18 Mar 2003 06:41:50 -0000	1.3
***************
*** 26,32 ****
  
  
! /**
!  * Calculates the angle between two vectors (with orientation)
!  */
  double angleBetweenTwoVectors(const Vector3 & v1, const Vector3 & v2)
  {
--- 26,32 ----
  
  
! //
! // Calculates the angle between two vectors (with orientation)
! //
  double angleBetweenTwoVectors(const Vector3 & v1, const Vector3 & v2)
  {
***************
*** 50,54 ****
  	}
  }
- 
  
  
--- 50,53 ----

Index: Vector3.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Vector3.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Vector3.cpp	28 Jan 2003 23:26:07 -0000	1.2
--- Vector3.cpp	18 Mar 2003 06:41:50 -0000	1.3
***************
*** 31,35 ****
  #include <SimData/Vector3.h>
  #include <SimData/Matrix3.h>
- #include <SimData/Vector3.inl>
  #include <SimData/Pack.h>
  
--- 31,34 ----

[Csp-commits] THIRDPARTYLIBS/demeter CHANGES.current,1.1,1.2 configure.in,1.4,1.5

[<mk...@us...>]

Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv26610

Modified Files:
	CHANGES.current configure.in 
Log Message:
autoconf 2.57 required

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/CHANGES.current,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CHANGES.current	15 Mar 2003 02:27:15 -0000	1.1
--- CHANGES.current	15 Mar 2003 22:30:45 -0000	1.2
***************
*** 4,5 ****
--- 4,8 ----
              First log entry: this is the format.
  
+ 2003-03-15: onsight
+             Changed configure.in to require autoconf 2.57
+ 

Index: configure.in
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure.in	9 Dec 2002 03:06:27 -0000	1.4
--- configure.in	15 Mar 2003 22:30:45 -0000	1.5
***************
*** 1,3 ****
! AC_PREREQ(2.13)
  
  # Process this file with autoconf to produce a configure script.
--- 1,3 ----
! AC_PREREQ(2.57)
  
  # Process this file with autoconf to produce a configure script.

[Csp-commits] THIRDPARTYLIBS/demeter README,1.1,1.2

[<mk...@us...>]

Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv31225

Modified Files:
	README 
Log Message:
note about build setup for linux

Index: README
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README	7 Dec 2002 07:40:05 -0000	1.1
--- README	15 Mar 2003 03:27:13 -0000	1.2
***************
*** 25,28 ****
  
      under *nix:
! 	./configure; make
  
--- 25,28 ----
  
      under *nix:
! 	aclocal; autoconf; ./configure; make
  

[Csp-commits] APPLICATIONS/CSPSim CHANGES,1.1,1.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv30212

Modified Files:
	CHANGES 
Log Message:


Index: CHANGES
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CHANGES	15 Mar 2003 02:26:21 -0000	1.1
--- CHANGES	15 Mar 2003 03:23:23 -0000	1.2
***************
*** 9,15 ****
  
  2003-03-14: onsight
!             Include file fix in GameScreen.cpp (LogStream.h)
! 
! 	    Removed -march flag from Makefile.in
  	    
  2003-03-12: delta
--- 9,18 ----
  
  2003-03-14: onsight
!             - Include file fix in GameScreen.cpp (LogStream.h)
! 	    - Removed -march flag from Makefile.in
! 	    - Temporary fix for osg lib version tests in configure.in
! 	    - Removed Source/FX/Makefile.in from configure targets.
! 	    - Added DynamicalObject.cpp to Makefile.
! 	    - Set sounds path to Data/Sounds in ini.
  	    
  2003-03-12: delta

[Csp-commits] APPLICATIONS/CSPSim/Data CSPSim.ini,1.6,1.7

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data
In directory sc8-pr-cvs1:/tmp/cvs-serv28842/Data

Modified Files:
	CSPSim.ini 
Log Message:
soundpath to data

Index: CSPSim.ini
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/CSPSim.ini,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CSPSim.ini	21 Feb 2003 08:00:25 -0000	1.6
--- CSPSim.ini	15 Mar 2003 03:17:33 -0000	1.7
***************
*** 16,19 ****
--- 16,20 ----
  FontPath = ../Data/Fonts
  TerrainPath = ../Data/Terrain
+ SoundPath = ../Data/Sounds
  
  [View]
***************
*** 25,30 ****
  
  [Testing]
- ;Date = 2003-02-18 19:50:00.0
  Date = 2003-02-18 15:00:00.0
  Latitude = 43.43
  Longitude = 5.5
--- 26,31 ----
  
  [Testing]
  Date = 2003-02-18 15:00:00.0
  Latitude = 43.43
  Longitude = 5.5
+ ;Date = 2003-02-18 19:50:00.0

[Csp-commits] APPLICATIONS/CSPSim/Source Makefile.in,1.4,1.5

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv28203/Source

Modified Files:
	Makefile.in 
Log Message:
added DynamicalSystem.cpp

Index: Makefile.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.in	21 Feb 2003 08:00:34 -0000	1.4
--- Makefile.in	15 Mar 2003 03:15:12 -0000	1.5
***************
*** 30,33 ****
--- 30,34 ----
  	CSPSim.cpp \
  	DynamicObject.cpp \
+ 	DynamicalSystem.cpp \
  	EventMapIndex.cpp \
  	EventMapping.cpp \

[Csp-commits] APPLICATIONS/CSPSim configure.in,1.7,1.8

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv28003

Modified Files:
	configure.in 
Log Message:
removed FX subdir

Index: configure.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** configure.in	15 Mar 2003 03:05:35 -0000	1.7
--- configure.in	15 Mar 2003 03:14:38 -0000	1.8
***************
*** 81,84 ****
  
  
! AC_OUTPUT([Makefile Source/Makefile Source/FX/Makefile], [])
  	      
--- 81,84 ----
  
  
! AC_OUTPUT([Makefile Source/Makefile], [])
  	      

[Csp-commits] APPLICATIONS/CSPSim configure.in,1.6,1.7

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv25879

Modified Files:
	configure.in 
Log Message:
temporary fix for osg lib tests

Index: configure.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configure.in	19 Feb 2003 21:24:15 -0000	1.6
--- configure.in	15 Mar 2003 03:05:35 -0000	1.7
***************
*** 52,55 ****
--- 52,67 ----
  dnl check for OpenSceneGraph
  CSP_OSG_CONFIG(osg, 0.9.3, [OpenSceneGraph])
+ # osg 0.9.3 segfaults when any of these libs are linked against a
+ # minimal version test script.  so, no version check for now, just
+ # see if the libs exist.  hopefully the next osg release will fix
+ # this!
+ AC_CHECK_LIB(osgGLUT, osgGLUTGetVersion, ,
+     [AC_MSG_ERROR(OpenSceneGraph utility library not found. See http://www.openscenegraph.org)],)
+ AC_CHECK_LIB(osgUtil, osgUtilGetVersion, ,
+     [AC_MSG_ERROR(OpenSceneGraph utility library not found. See http://www.openscenegraph.org)],)
+ AC_CHECK_LIB(osgText, osgTextGetVersion, ,
+     [AC_MSG_ERROR(OpenSceneGraph utility library not found. See http://www.openscenegraph.org)],)
+ AC_CHECK_LIB(osgParticle, osgParticleGetVersion, ,
+     [AC_MSG_ERROR(OpenSceneGraph utility library not found. See http://www.openscenegraph.org)],)
  #CSP_OSG_CONFIG(osgGLUT, 0.9.3, [OpenSceneGraph GLUT library])
  #CSP_OSG_CONFIG(osgUtil, 0.9.3, [OpenSceneGraph Util library])

[Csp-commits] THIRDPARTYLIBS/demeter CHANGES,NONE,1.1 CHANGES.current,NONE,1.1

[<mk...@us...>]

Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv13611

Added Files:
	CHANGES CHANGES.current 
Log Message:


--- NEW FILE: CHANGES ---
DemeterCSP release change log.  See CHANGES.current for the latest updates
to CVS.

Version 0.3.0 (2003-03-14)
===========================
2003-03-14: onsight
            CHANGES and CHANGES.current started. First tagged version of
            DemeterCSP: 0.3.0
			

--- NEW FILE: CHANGES.current ---
Version 0.3.1 (in progress)
===========================
2003-03-14: onsight
            First log entry: this is the format.

[Csp-commits] APPLICATIONS/SimData CHANGES,1.1,1.2 CHANGES.current,1.1,1.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv13474

Modified Files:
	CHANGES CHANGES.current 
Log Message:


Index: CHANGES
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CHANGES	14 Mar 2003 23:08:36 -0000	1.1
--- CHANGES	15 Mar 2003 02:26:43 -0000	1.2
***************
*** 2,9 ****
  to CVS.
  
! Version 0.3.0 (2003-03-??)
  ===========================
  2003-03-14: onsight
!             CHANGES and CHANGES.current started.  First tagged version
! 	    of SimData: 0.3.0
  
--- 2,9 ----
  to CVS.
  
! Version 0.3.0 (2003-03-14)
  ===========================
  2003-03-14: onsight
!             CHANGES and CHANGES.current started. First tagged version of
!             SimData: 0.3.0
  

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CHANGES.current	14 Mar 2003 23:08:37 -0000	1.1
--- CHANGES.current	15 Mar 2003 02:26:43 -0000	1.2
***************
*** 3,34 ****
  
  2003-03-13: onsight
!             * fixed several bugs related to std::vector types
!             * fix to allow inplace (anonymous) object definitions in xml
  
!             Added a logging facility so we can filter and redirect messages 
! 	    to a file.  The syntax is similar to that used in CSP:
  
! 	        SIMDATA_LOG(type, severity, msg)
  
! 	    Where type is one of (LOG_TYPE, LOG_ARCHIVE, LOG_REGISTRY, ...)
! 	    and severity is one of (LOG_TRACE, LOG_DEBUG, LOG_INFO, LOG_WARN,
! 	    LOG_ALERT, LOG_ERROR).  The msg field can include the usual
! 	    ostream operators (<<).
! 	    
!             Added a new postCreate() method in Object which is called after 
!             unpack() is complete.  You can extend this to do additional 
!             object setup once the data is loaded.  From now on, unpack() 
!             must be the exact inverse operation of pack().
! 	    
!             Data compiler enhancements, mainly the ability to only reparse 
! 	    xml files that have changed since the archive was last generated. 
! 	    This significantly speeds up the processing.  Specifying
! 	    '--rebuild' on the command line will rebuild the entire archive
! 	    from scratch.
  
!             Big simplification of the various smart pointer types:
! 	        PathPointer<T> is gone; now just use Pointer<T> for all 
! 		object references.  PathPointerBase is not PointerBase,
! 		and what was originally PointerBase is now ReferencedPointer
! 		(although you shouldn't need to use these classed directly).
  
--- 3,35 ----
  
  2003-03-13: onsight
!             Fixed several bugs related to std::vector types
! 	    
! 	    Fix to allow inplace (anonymous) object definitions in xml
  
!             Added a logging facility so we can filter and redirect messages
!             to a file. The syntax is similar to that used in CSP:
  
!             SIMDATA_LOG(type, severity, msg)
  
!             Where type is one of (LOG_TYPE, LOG_ARCHIVE, LOG_REGISTRY, ...)
!             and severity is one of (LOG_TRACE, LOG_DEBUG, LOG_INFO,
!             LOG_WARN, LOG_ALERT, LOG_ERROR). The msg field can include the
!             usual ostream operators (<<).
  
!             Added a new postCreate() method in Object which is called after
!             unpack() is complete. You can extend this to do additional
!             object setup once the data is loaded. From now on, unpack() must
!             be the exact inverse operation of pack().
! 
!             Data compiler enhancements, mainly the ability to only reparse
!             xml files that have changed since the archive was last
!             generated. This significantly speeds up the processing.
!             Specifying '--rebuild' on the command line will rebuild the
!             entire archive from scratch.
! 
!             Big simplification of the various smart pointer types.
!             PathPointer<T> is gone; now just use Pointer<T> for all object
!             references. PathPointerBase is not PointerBase, and what was
!             originally PointerBase is now ReferencedPointer (although you
!             shouldn't need to use these classed directly).
  

[Csp-commits] APPLICATIONS/CSPSim CHANGES,NONE,1.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv13425

Added Files:
	CHANGES 
Log Message:


--- NEW FILE: CHANGES ---
CSPSim release change log.  See CHANGES.current for the latest updates
to CVS.

Version 0.3.0 (2003-03-14)
===========================
2003-03-14: onsight
            CHANGES and CHANGES.current started. First tagged version of
            CSPSim: 0.3.0

2003-03-14: onsight
            Include file fix in GameScreen.cpp (LogStream.h)

	    Removed -march flag from Makefile.in
	    
2003-03-12: delta
            Cleaning code for ScreenInfo and ScreenInfoManager. It still
            needs some improvements but it should be better now. Note that
            osgText has been entirely reimplemented. Although, I didn t use
            it, we ll need to switch to it soon: more flexible interface,
            robuster and faster code.

            I added a Runge-Kutta method RK_24, with a predictive step and a
            corrective one; it is implemented as an abstract class in
            DynamicalSystem (.cpp & .h). A dynamical system is roughly
            speaking a system of differential equations (ODE); a pure
            virtual method is the vector field which looks like vector
            f(time,vector); here, vector is a std::vector<double> of any
            dimension; you need to pass its size when you instantiate a
            DynamicalSystem. This class is generic and could be use as soon
            as a vector field may be defined.

            Aerodynamics inherites now from DynamicalSystem. I ve done some
            minor cleaning in code and implement some helper functions to
            use with dynamical system. Call to this numerical method occurs
            in doSimStep2; it will be keep until others will have tested it
            enough (so, old code is still available and functional - just 1
            line to be changed to switch back).

            I added a line in CSPSim.ini to read sound files (still
            hardcoded). At the moment, SDL API is used but it should be
            replaced by OpenAL soon (Wolverine is working on it). Looks like
            that here:

            SoundPath = ../Data/Sounds

            Changed the radius of skydome to 64000 (hardcoded!, pkz Onsight,
            check it)

            Others changes are minor.