[Jboost-cvs] jboost/src/jboost/tokenizer jboost_DataStream.java, 1.2, 1.3

[Aaron A. <aa...@us...>]

Update of /cvsroot/jboost/jboost/src/jboost/tokenizer
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26189/tokenizer

Modified Files:
	jboost_DataStream.java 
Log Message:
Cost sensitive normalboost, fixed compile bug in BooleanAttribute

Index: jboost_DataStream.java
===================================================================
RCS file: /cvsroot/jboost/jboost/src/jboost/tokenizer/jboost_DataStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** jboost_DataStream.java	23 Oct 2007 23:52:26 -0000	1.2
--- jboost_DataStream.java	24 Jan 2008 22:48:54 -0000	1.3
***************
*** 298,303 ****
              }
              // make sure the type is one of the three supported
!             if (!(type.equals("finite") || type.equals("text") || type.equals("number") 
!             		|| type.equals("string"))) {
                throw new SpecFileException("Type not valid for attribute " + line);
              }
--- 298,308 ----
              }
              // make sure the type is one of the three supported
!             if (!(type.equals("finite") || 
! 		  type.equals("text") || 
! 		  type.equals("number") ||  
! 		  type.equals("string") || 
! 		  type.equals("int") || 
! 		  type.equals("bool")
! 		  )) {
                throw new SpecFileException("Type not valid for attribute " + line);
              }
***************
*** 357,367 ****
              if (attribute != null) {
                if (name.equals(DataStream.LABELS_ATTR)) {
!                 ed.setLabel(attribute, lineCount);
                } else if (name.equals(DataStream.WEIGHT_ATTR)) {
!                   ed.setWeight(attribute, lineCount);/*
                } else if (name.equals(DataStream.ID_ATTR)) {
! 	      ed.setId(attribute, lineCount);*/
                } else {
!                 ed.addAttribute(attribute);
                }
  
--- 362,372 ----
              if (attribute != null) {
                if (name.equals(DataStream.LABELS_ATTR)) {
! 		  ed.setLabel(attribute, lineCount);
                } else if (name.equals(DataStream.WEIGHT_ATTR)) {
!                   ed.setWeight(attribute, lineCount);
                } else if (name.equals(DataStream.ID_ATTR)) {
! 		  //ed.setId(attribute, lineCount);
                } else {
! 		  ed.addAttribute(attribute);
                }