[Csp-commits] APPLICATIONS/SimData/Source InterfaceRegistry.cpp,1.5,1.6 Makefile,1.7,1.8 TypeAdapter.cpp,1.3,1.4

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

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

Modified Files:
	InterfaceRegistry.cpp Makefile TypeAdapter.cpp 
Log Message:
see CHANGES.current

Index: InterfaceRegistry.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/InterfaceRegistry.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** InterfaceRegistry.cpp	18 Mar 2003 10:04:05 -0000	1.5
--- InterfaceRegistry.cpp	26 Mar 2003 06:38:03 -0000	1.6
***************
*** 239,243 ****
  
  #include <vector>
! #include <SimData/Spread.h>
  #include <SimData/Path.h>
  
--- 239,243 ----
  
  #include <vector>
! #include <SimData/Real.h>
  #include <SimData/Path.h>
  
***************
*** 266,271 ****
  	END_SIMDATA_XML_INTERFACE
  	int size;
! 	simdata::Spread x;
! 	std::vector<simdata::Spread> y;
  	std::vector<X> z;
  	X q;
--- 266,271 ----
  	END_SIMDATA_XML_INTERFACE
  	int size;
! 	simdata::Real x;
! 	std::vector<simdata::Real> y;
  	std::vector<X> z;
  	X q;
***************
*** 274,278 ****
  		cout << (float)x << endl;
  		cout << "y has " << y.size() << " items:" << endl;
! 		std::vector<simdata::Spread>::iterator i;
  		for (i=y.begin(); i != y.end(); i++) cout << "   " << (float)(*i) << endl;
  		cout << "z has " << z.size() << " items:" << endl;
--- 274,278 ----
  		cout << (float)x << endl;
  		cout << "y has " << y.size() << " items:" << endl;
! 		std::vector<simdata::Real>::iterator i;
  		for (i=y.begin(); i != y.end(); i++) cout << "   " << (float)(*i) << endl;
  		cout << "z has " << z.size() << " items:" << endl;
***************
*** 338,342 ****
  	float float_test;
  	std::string string_test;
! 	simdata::Spread spread_test;
  	simdata::SimDate date_test;
  	simdata::Vector3 vector_test;
--- 338,342 ----
  	float float_test;
  	std::string string_test;
! 	simdata::Real spread_test;
  	simdata::SimDate date_test;
  	simdata::Vector3 vector_test;
***************
*** 348,352 ****
  	simdata::Table table_test;
  	simdata::PathPointer<A> path_test;
! 	std::vector<simdata::Spread> list_test;
  	TEST(): simdata::Object(), enumeration("A B C D"), enum_test(enumeration) {}
  	virtual void pack(simdata::Packer &) const {
--- 348,352 ----
  	simdata::Table table_test;
  	simdata::PathPointer<A> path_test;
! 	std::vector<simdata::Real> list_test;
  	TEST(): simdata::Object(), enumeration("A B C D"), enum_test(enumeration) {}
  	virtual void pack(simdata::Packer &) const {
***************
*** 365,369 ****
  		cout << "    table_test " << table_test.asString() << endl;
  		cout << "     list_test ";
! 		std::vector<simdata::Spread>::const_iterator j;
  		for (j=list_test.begin(); j != list_test.end(); j++) cout << j->asString();
  		cout << endl;
--- 365,369 ----
  		cout << "    table_test " << table_test.asString() << endl;
  		cout << "     list_test ";
! 		std::vector<simdata::Real>::const_iterator j;
  		for (j=list_test.begin(); j != list_test.end(); j++) cout << j->asString();
  		cout << endl;

Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile	26 Mar 2003 05:08:03 -0000	1.7
--- Makefile	26 Mar 2003 06:38:03 -0000	1.8
***************
*** 30,34 ****
  	Quaternion \
  	Random \
! 	Spread \
  	TypeAdapter \
  	Vector3 \
--- 30,34 ----
  	Quaternion \
  	Random \
! 	Real \
  	TypeAdapter \
  	Vector3 \

Index: TypeAdapter.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/TypeAdapter.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TypeAdapter.cpp	18 Mar 2003 10:04:06 -0000	1.3
--- TypeAdapter.cpp	26 Mar 2003 06:38:03 -0000	1.4
***************
*** 60,64 ****
  void TypeAdapter::set(PathPointerBase &x) const { setBase(x); }
  void TypeAdapter::set(External &x) const { setBase(x); }
! void TypeAdapter::set(Spread &x) const { setBase(x); }
  void TypeAdapter::set(Enum &x) const { if (isType(STRING)) x = s; else setBase(x); }
  void TypeAdapter::set(ListBase &x) const { setBase(x); }
--- 60,64 ----
  void TypeAdapter::set(PathPointerBase &x) const { setBase(x); }
  void TypeAdapter::set(External &x) const { setBase(x); }
! void TypeAdapter::set(Real &x) const { setBase(x); }
  void TypeAdapter::set(Enum &x) const { if (isType(STRING)) x = s; else setBase(x); }
  void TypeAdapter::set(ListBase &x) const { setBase(x); }