From c8ab0f6be8b04ff68ff49e1219a28b5b0f3dc070 Mon Sep 17 00:00:00 2001
From: rwl <r.w.lincoln@gmail.com>
Date: Thu, 3 May 2012 01:58:05 +0100
Subject: [PATCH] Passing simple demo.

---
 src/main/java/edu/ufl/cise/klu/tdouble/Dklu_kernel.java      | 8 ++++----
 src/main/java/edu/ufl/cise/klu/tdouble/Dklu_memory.java      | 2 +-
 src/test/java/edu/ufl/cise/klu/tdouble/demo/Dklu_simple.java | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/edu/ufl/cise/klu/tdouble/Dklu_kernel.java b/src/main/java/edu/ufl/cise/klu/tdouble/Dklu_kernel.java
index 36c1593..d3586cc 100644
--- a/src/main/java/edu/ufl/cise/klu/tdouble/Dklu_kernel.java
+++ b/src/main/java/edu/ufl/cise/klu/tdouble/Dklu_kernel.java
@@ -820,7 +820,7 @@ public class Dklu_kernel extends Dklu_internal {
 				for (p = 0 ; p < Llen [Llen_offset + k] ; p++)
 				{
 					PRINTF ("pattern of X in L: %d : %d pivot row: %d\n",
-						p, Li [Li_offset[0] + p], Pinv [(int) Li [Li_offset[0] + p]]) ;
+						p, (int) Li [Li_offset[0] + p], Pinv [(int) Li [Li_offset[0] + p]]) ;
 					ASSERT (Flag [(int) Li [Li_offset[0] + p]] == k) ;
 				}
 				p = 0 ;
@@ -856,7 +856,7 @@ public class Dklu_kernel extends Dklu_internal {
 				Li_offset[0] = Lip [Lip_offset + k] ;
 				for (p = 0 ; p < Llen [Llen_offset + k] ; p++)
 				{
-					PRINTF ("X for L %d : ", Li [Li_offset[0] + p]) ;
+					PRINTF ("X for L %d : ", (int) Li [Li_offset[0] + p]) ;
 					PRINT_ENTRY (X [(int) Li [Li_offset[0] + p]]) ;
 				}
 			}
@@ -966,7 +966,7 @@ public class Dklu_kernel extends Dklu_internal {
 						Ui_offset, Ux_offset, k, len) ;
 				for (p = 0 ; p < len[0] ; p++)
 				{
-					PRINTF ("Column %d of U: %d : ", k, Ui [Ui_offset[0] + p]) ;
+					PRINTF ("Column %d of U: %d : ", k, (int) Ui [Ui_offset[0] + p]) ;
 					PRINT_ENTRY (Ux [Ux_offset[0] + p]) ;
 				}
 
@@ -974,7 +974,7 @@ public class Dklu_kernel extends Dklu_internal {
 						Li_offset, Lx_offset, k, len) ;
 				for (p = 0 ; p < len[0] ; p++)
 				{
-					PRINTF ("Column %d of L: %d : ", k, Li [Li_offset[0] + p]) ;
+					PRINTF ("Column %d of L: %d : ", k, (int) Li [Li_offset[0] + p]) ;
 					PRINT_ENTRY (Lx [Lx_offset[0] + p]) ;
 				}
 			}
diff --git a/src/main/java/edu/ufl/cise/klu/tdouble/Dklu_memory.java b/src/main/java/edu/ufl/cise/klu/tdouble/Dklu_memory.java
index fa26a40..2dc5b5c 100644
--- a/src/main/java/edu/ufl/cise/klu/tdouble/Dklu_memory.java
+++ b/src/main/java/edu/ufl/cise/klu/tdouble/Dklu_memory.java
@@ -149,7 +149,6 @@ public class Dklu_memory extends Dklu_internal {
 	{
 		double[] pnew ;
 		int snew ;
-		@SuppressWarnings("unused")
 		int sold ;
 
 		if (Common == null)
@@ -175,6 +174,7 @@ public class Dklu_memory extends Dklu_internal {
 			try
 			{
 				pnew = new double[snew] ;
+				System.arraycopy(p, 0, pnew, 0, MIN (snew, sold)) ;
 				Runtime runtime = Runtime.getRuntime();
 				Common.memusage = runtime.totalMemory() - runtime.freeMemory();
 				//Common.memusage += (snew - sold) ;
diff --git a/src/test/java/edu/ufl/cise/klu/tdouble/demo/Dklu_simple.java b/src/test/java/edu/ufl/cise/klu/tdouble/demo/Dklu_simple.java
index 7c7c7b4..cf8d5af 100644
--- a/src/test/java/edu/ufl/cise/klu/tdouble/demo/Dklu_simple.java
+++ b/src/test/java/edu/ufl/cise/klu/tdouble/demo/Dklu_simple.java
@@ -4,6 +4,7 @@ import junit.framework.TestCase;
 import edu.ufl.cise.klu.common.KLU_common;
 import edu.ufl.cise.klu.common.KLU_numeric;
 import edu.ufl.cise.klu.common.KLU_symbolic;
+import edu.ufl.cise.klu.tdouble.Dklu_internal;
 import edu.ufl.cise.klu.tdouble.Dklu_version;
 
 import static edu.ufl.cise.klu.tdouble.Dklu_defaults.klu_defaults;
@@ -30,7 +31,8 @@ public class Dklu_simple extends TestCase {
 		KLU_numeric Numeric;
 		KLU_common Common = new KLU_common();
 
-		Dklu_version.NPRINT = false;
+		Dklu_version.NPRINT = false ;
+		Dklu_internal.NDEBUG = false ;
 
 		klu_defaults (Common);
 		Symbolic = klu_analyze (n, Ap, Ai, Common);
-- 
2.11.4.GIT