[Csp-commits] APPLICATIONS/SimData/Source Interpolate.cpp,1.5,1.6 Makefile,1.6,1.7 Random.cpp,1.3,1.

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	Interpolate.cpp Makefile Random.cpp 
Log Message:
see CHANGES.current

Index: Interpolate.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Interpolate.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Interpolate.cpp	18 Mar 2003 10:04:05 -0000	1.5
--- Interpolate.cpp	26 Mar 2003 05:08:03 -0000	1.6
***************
*** 26,29 ****
--- 26,32 ----
  NAMESPACE_SIMDATA
  
+ typedef InterpolatedData::value_t value_t;
+ typedef InterpolatedData::vector_t vector_t;
+ 
  
  #define min(a, b) (((a)<(b)) ? (a) : (b))
***************
*** 86,90 ****
  }
  
! int InterpolatedData::find(vector_t b, value_t v) {
  	int lo = 0;
  	int hi = b.size()-1;
--- 89,93 ----
  }
  
! int InterpolatedData::find(vector_t b, value_t v) const {
  	int lo = 0;
  	int hi = b.size()-1;
***************
*** 178,182 ****
  }
  
! value_t Curve::getPrecise(value_t v) {
  	int i = find(_breaks, v);
  	double h = _breaks[i+1] - _breaks[i];
--- 181,185 ----
  }
  
! value_t Curve::getPrecise(value_t v) const {
  	int i = find(_breaks, v);
  	double h = _breaks[i+1] - _breaks[i];
***************
*** 192,196 ****
  }
  
! value_t Curve::getValue(value_t p) {
  	double i = (p - _min) / _range;
  	if (i < 0.0) i = 0.0;
--- 195,199 ----
  }
  
! value_t Curve::getValue(value_t p) const {
  	double i = (p - _min) / _range;
  	if (i < 0.0) i = 0.0;
***************
*** 205,212 ****
  }
  
! void Curve::dumpCurve(FILE* f) {
  	double x = _min;
  	double d = _range / _table.size();
! 	vector_it element = _table.begin();
  	while (element != _table.end()) {
  		fprintf(f, "%.4f %.4f\n", x, *element++);
--- 208,215 ----
  }
  
! void Curve::dumpCurve(FILE* f) const {
  	double x = _min;
  	double d = _range / _table.size();
! 	vector_cit element = _table.begin();
  	while (element != _table.end()) {
  		fprintf(f, "%.4f %.4f\n", x, *element++);
***************
*** 260,264 ****
  }
  
! int Table::isValid() {
  	return _valid; 
  }
--- 263,267 ----
  }
  
! int Table::isValid() const {
  	return _valid; 
  }
***************
*** 371,375 ****
  }
  
! value_t Table::getPrecise(value_t x, value_t y) {
  	assert(isValid());
  	int x_i = find(_x_breaks, x);
--- 374,378 ----
  }
  
! value_t Table::getPrecise(value_t x, value_t y) const {
  	assert(isValid());
  	int x_i = find(_x_breaks, x);
***************
*** 411,415 ****
  }
  
! value_t Table::getValue(value_t x, value_t y) {
  	assert(isValid());
  	double x_i = (x - _x_min) / _x_range;
--- 414,418 ----
  }
  
! value_t Table::getValue(value_t x, value_t y) const {
  	assert(isValid());
  	double x_i = (x - _x_min) / _x_range;
***************
*** 462,469 ****
  }
  
! void Table::toPGM(FILE *fp) {
  	fprintf(fp, "P2 %d %d 255\n", _x_in, _y_in);
  	int i, j;
! 	vector_it element = _table.begin();
  	double min=1e+10, max=-1e+10, v;
  	for (i=_x_in*_y_in; i>0; i--) {
--- 465,472 ----
  }
  
! void Table::toPGM(FILE *fp) const {
  	fprintf(fp, "P2 %d %d 255\n", _x_in, _y_in);
  	int i, j;
! 	vector_cit element = _table.begin();
  	double min=1e+10, max=-1e+10, v;
  	for (i=_x_in*_y_in; i>0; i--) {
***************
*** 485,491 ****
  }
  
! void Table::dumpTable(FILE *fp) {
  	int i, j;
! 	vector_it element = _table.begin();
  	for (j=0; j<_y_in; j++) {
  		for (i=0; i<_x_in; i++) {
--- 488,494 ----
  }
  
! void Table::dumpTable(FILE *fp) const {
  	int i, j;
! 	vector_cit element = _table.begin();
  	for (j=0; j<_y_in; j++) {
  		for (i=0; i<_x_in; i++) {
***************
*** 496,502 ****
  }
  
! void Table::dumpDRows(FILE *fp) {
  	int i, j;
! 	vector_it element = _drows.begin();
  	for (j=0; j<_y_n; j++) {
  		for (i=0; i<_x_n; i++) {
--- 499,505 ----
  }
  
! void Table::dumpDRows(FILE *fp) const {
  	int i, j;
! 	vector_cit element = _drows.begin();
  	for (j=0; j<_y_n; j++) {
  		for (i=0; i<_x_n; i++) {
***************
*** 507,513 ****
  }
  
! void Table::dumpDCols(FILE *fp) {
  	int i, j;
! 	vector_it element = _dcols.begin();
  	for (j=0; j<_y_n; j++) {
  		for (i=0; i<_x_n; i++) {
--- 510,516 ----
  }
  
! void Table::dumpDCols(FILE *fp) const {
  	int i, j;
! 	vector_cit element = _dcols.begin();
  	for (j=0; j<_y_n; j++) {
  		for (i=0; i<_x_n; i++) {

Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile	21 Mar 2003 18:38:03 -0000	1.6
--- Makefile	26 Mar 2003 05:08:03 -0000	1.7
***************
*** 1,4 ****
  TOPDIR = ..
! INCLUDE = -I$(TOPDIR)/Include
  
  CFLAGS = $(GCFLAGS) $(INCLUDE) $(GDEBUGF)
--- 1,4 ----
  TOPDIR = ..
! INCLUDE = -I$(TOPDIR)/Include -I$(PYTHON_INCLUDE)
  
  CFLAGS = $(GCFLAGS) $(INCLUDE) $(GDEBUGF)
***************
*** 24,27 ****
--- 24,28 ----
  	Math \
  	Matrix3 \
+ 	Noise \
  	Object \
  	Pack \
***************
*** 93,96 ****
--- 94,98 ----
  	ar cru $@ $^
  	ranlib $@
+ 	cp $@ $(TOPDIR)/SimData
  
  _cSimData.so: $(OBJECTS) cSimData_wrap.o
***************
*** 103,107 ****
  
  cSimData_wrap.o: cSimData_wrap.cpp
! 	$(CXX) -I$(PYTHON_INCLUDE) -DSWIG_GLOBAL -c $(SWCXXF) $(@:.o=.cpp)
  
  %.o: %.cpp 
--- 105,109 ----
  
  cSimData_wrap.o: cSimData_wrap.cpp
! 	$(CXX) -c $(SWCXXF) -I$(PYTHON_INCLUDE) $(@:.o=.cpp)
  
  %.o: %.cpp 

Index: Random.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Random.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Random.cpp	6 Feb 2003 21:22:57 -0000	1.3
--- Random.cpp	26 Mar 2003 05:08:03 -0000	1.4
***************
*** 46,51 ****
  	else {
  		do {
! 			x1 = 2.0 * g_Random.NewRand() - 1.0;
! 			x2 = 2.0 * g_Random.NewRand() - 1.0;
  			w = x1 * x1 + x2 * x2;
  		} while ( w >= 1.0 );
--- 46,51 ----
  	else {
  		do {
! 			x1 = 2.0 * g_Random.newRand() - 1.0;
! 			x2 = 2.0 * g_Random.newRand() - 1.0;
  			w = x1 * x1 + x2 * x2;
  		} while ( w >= 1.0 );
***************
*** 144,148 ****
  
  /* 
!  * Generate random number with a normal distribution.
   *
   * Classic, fast method using polar coordinates.  See
--- 144,148 ----
  
  /* 
!  * Generate a random number with a normal distribution.
   *
   * Classic, fast method using polar coordinates.  See
***************
*** 162,167 ****
  	else {
  		do {
! 			x1 = 2.0 * NewRand() - 1.0;
! 			x2 = 2.0 * NewRand() - 1.0;
  			w = x1 * x1 + x2 * x2;
  		} while ( w >= 1.0 );
--- 162,167 ----
  	else {
  		do {
! 			x1 = 2.0 * newRand() - 1.0;
! 			x2 = 2.0 * newRand() - 1.0;
  			w = x1 * x1 + x2 * x2;
  		} while ( w >= 1.0 );

[Csp-commits] APPLICATIONS/SimData/Source Interpolate.cpp,1.5,1.6 Makefile,1.6,1.7 Random.cpp,1.3,1.

[Csp-commits] APPLICATIONS/SimData/Source Interpolate.cpp,1.5,1.6 Makefile,1.6,1.7 Random.cpp,1.3,1.4