[rkward-cvs] rkward/rkward/core rkvariable.cpp,1.32,1.33

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/core
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17490/core

Modified Files:
	rkvariable.cpp 
Log Message:
Simplify parsing, initialize na_double after R has started

Index: rkvariable.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/core/rkvariable.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** rkvariable.cpp	20 Apr 2006 10:46:33 -0000	1.32
--- rkvariable.cpp	19 Jun 2006 20:04:30 -0000	1.33
***************
*** 19,22 ****
--- 19,23 ----
  #include <qstringlist.h>
  #include "float.h"
+ #include "math.h"
  
  #include "rcontainerobject.h"
***************
*** 582,586 ****
  		for (int row=from_row; row <= to_row; ++row) {
  			deleteStringData (row);
! 			if (data[i] == RKGlobals::na_double) myData ()->cell_string_data[row] = RKGlobals::empty_char;
  			myData ()->cell_double_data[row] = data[i++];
  		}
--- 583,587 ----
  		for (int row=from_row; row <= to_row; ++row) {
  			deleteStringData (row);
! 			if (isnan (data[i])) myData ()->cell_string_data[row] = RKGlobals::empty_char;
  			myData ()->cell_double_data[row] = data[i++];
  		}