[Jigs-commits] CVS: jigs/src/edu/whitman/halfway/util StringUtil.java, 1.15, 1.16 SlowTranMatrix2D.java, 1.1, 1.2 TranMatrix2D.java, 1.3, 1.4 HashTranMatrix2D.java, 1.1, 1.2 PropProvider.java, 1.7, 1.8

[Brent B. <bre...@us...>]

Update of /cvsroot/jigs/jigs/src/edu/whitman/halfway/util
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21653/src/edu/whitman/halfway/util

Modified Files:
	StringUtil.java SlowTranMatrix2D.java TranMatrix2D.java 
	HashTranMatrix2D.java PropProvider.java 
Log Message:


Index: StringUtil.java
===================================================================
RCS file: /cvsroot/jigs/jigs/src/edu/whitman/halfway/util/StringUtil.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** StringUtil.java	19 Nov 2006 22:24:09 -0000	1.15
--- StringUtil.java	28 Nov 2006 20:00:57 -0000	1.16
***************
*** 366,368 ****
    }
  
! }
--- 366,376 ----
    }
  
! 	public static String toString(double[] array) {
!   	StringBuilder sb = new StringBuilder("[");
!   	for (Object t : array) {
!   		sb.append(t+", ");
!   	}
!   	sb.setCharAt(sb.length()-1, ']');
!   	return sb.toString();
! 	}
! }
\ No newline at end of file

Index: SlowTranMatrix2D.java
===================================================================
RCS file: /cvsroot/jigs/jigs/src/edu/whitman/halfway/util/SlowTranMatrix2D.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SlowTranMatrix2D.java	7 Nov 2004 00:57:17 -0000	1.1
--- SlowTranMatrix2D.java	28 Nov 2006 20:00:57 -0000	1.2
***************
*** 2,12 ****
  
  
- import cern.colt.list.*;
  import cern.colt.matrix.*;
  import cern.colt.matrix.impl.*;
- import cern.colt.map.*;
- import cern.colt.matrix.linalg.Algebra;
- import cern.colt.bitvector.*;
- import cern.colt.function.IntDoubleProcedure;
  import org.apache.log4j.Logger;
  import cern.colt.function.IntDoubleFunction;
--- 2,7 ----

Index: TranMatrix2D.java
===================================================================
RCS file: /cvsroot/jigs/jigs/src/edu/whitman/halfway/util/TranMatrix2D.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TranMatrix2D.java	27 Oct 2004 19:00:44 -0000	1.3
--- TranMatrix2D.java	28 Nov 2006 20:00:57 -0000	1.4
***************
*** 3,13 ****
  
  //import cern.colt.list.*;
! import cern.colt.matrix.*;
! import cern.colt.matrix.impl.*;
! import cern.colt.map.*;
  //import cern.colt.matrix.linalg.Algebra;
  //import cern.colt.bitvector.*;
  //import cern.colt.function.IntDoubleProcedure;
! import org.apache.log4j.Logger;
  import cern.colt.function.IntDoubleFunction;
  
--- 3,13 ----
  
  //import cern.colt.list.*;
! //import cern.colt.matrix.*;
! //import cern.colt.matrix.impl.*;
! //import cern.colt.map.*;
  //import cern.colt.matrix.linalg.Algebra;
  //import cern.colt.bitvector.*;
  //import cern.colt.function.IntDoubleProcedure;
! //import org.apache.log4j.Logger;
  import cern.colt.function.IntDoubleFunction;
  

Index: HashTranMatrix2D.java
===================================================================
RCS file: /cvsroot/jigs/jigs/src/edu/whitman/halfway/util/HashTranMatrix2D.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HashTranMatrix2D.java	7 Nov 2004 00:57:17 -0000	1.1
--- HashTranMatrix2D.java	28 Nov 2006 20:00:57 -0000	1.2
***************
*** 6,15 ****
  import cern.colt.matrix.impl.*;
  import cern.colt.map.*;
- import cern.colt.matrix.linalg.Algebra;
- import cern.colt.bitvector.*;
- import cern.colt.function.IntDoubleProcedure;
  import org.apache.log4j.Logger;
  import cern.colt.function.IntDoubleFunction;
- import cern.colt.function.IntProcedure;
  
  public class HashTranMatrix2D extends SparseDoubleMatrix2D
--- 6,11 ----

Index: PropProvider.java
===================================================================
RCS file: /cvsroot/jigs/jigs/src/edu/whitman/halfway/util/PropProvider.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PropProvider.java	20 Nov 2006 19:52:24 -0000	1.7
--- PropProvider.java	28 Nov 2006 20:00:57 -0000	1.8
***************
*** 1,8 ****
  package edu.whitman.halfway.util;
  
- import java.util.*;
- import org.apache.log4j.Logger;
- import java.lang.reflect.*;
  import java.io.*;
  
  public class PropProvider {
--- 1,11 ----
  package edu.whitman.halfway.util;
  
  import java.io.*;
+ import java.lang.reflect.Field;
+ import java.lang.reflect.Modifier;
+ import java.util.Properties;
+ import java.util.Map.Entry;
+ 
+ import org.apache.log4j.Logger;
  
  public class PropProvider {
***************
*** 17,20 ****
--- 20,54 ----
    }
  
+   public String getFormattedString() {
+   	return getFormattedString("");
+   }
+   public String getFormattedString(String prefix) {
+   	StringBuilder sb = new StringBuilder();
+   	Properties props = getProps();
+   	
+   	int maxKeyLength = 0;
+   	
+   	for (Object key : props.keySet()) {
+   		int length = key.toString().length();
+   		if (length > maxKeyLength) {
+   			maxKeyLength = length;
+   		}
+   	}
+   	maxKeyLength +=2;
+   	
+   	for (Entry entry : props.entrySet()) {
+   		sb.append(prefix);
+   		String key = entry.getKey().toString();
+   		sb.append(key+":");
+   		
+   		for (int i=key.length(); i<maxKeyLength; i++) {
+   			sb.append(" ");
+   		}
+   		sb.append(entry.getValue().toString());
+   		sb.append(StringUtil.newline);
+   	}
+   	return sb.toString();
+   }
+   
    public Properties getProps(String prefix) {
      Class cl = getClass();
***************
*** 25,35 ****
        if (!Modifier.isStatic(mods) && !Modifier.isTransient(mods)) {
          try {
- 
            Object fldValue = fields[i].get(this);
            String s;
            if (fldValue == null) {
              s = "null";
            } else {
!             s = fldValue.toString();
            }
            props.setProperty(fields[i].getName(), s);
--- 59,79 ----
        if (!Modifier.isStatic(mods) && !Modifier.isTransient(mods)) {
          try {
            Object fldValue = fields[i].get(this);
            String s;
+ 
            if (fldValue == null) {
              s = "null";
+ 
+           } else if (fldValue.getClass().isArray()) {
+           	if (fldValue.getClass().getComponentType() == Double.TYPE) {
+           		double[] array = (double[])fldValue;
+           		s = StringUtil.toString(array);
+           	} else {
+           		log.warn("Array Elements Not Converted to String.");
+           		s = fldValue.toString();
+           	}
+ 
            } else {
!           	s = fldValue.toString();
            }
            props.setProperty(fields[i].getName(), s);