From b25ba4c397cb33f3177d78a5370ed64b2497a983 Mon Sep 17 00:00:00 2001
From: Andy Baxter <andrewbaxter439@gmail.com>
Date: Mon, 1 Sep 2025 13:34:56 +0100
Subject: [PATCH 1/3] change order of comma adding to prepend each new entry

---
 microsim-core/src/main/java/microsim/data/ExportCSV.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/microsim-core/src/main/java/microsim/data/ExportCSV.java b/microsim-core/src/main/java/microsim/data/ExportCSV.java
index c5f497cb..784edf89 100644
--- a/microsim-core/src/main/java/microsim/data/ExportCSV.java
+++ b/microsim-core/src/main/java/microsim/data/ExportCSV.java
@@ -210,19 +210,19 @@ public void dumpToCSV() {
 	        		
 	        		Field idField = obj.getClass().getDeclaredField(idFieldName);
 	        		idField.setAccessible(true);
-					bufferWriter.append(((PanelEntityKey)idField.get(obj)).getId() + delimiter);
+					bufferWriter.append((char) ((PanelEntityKey)idField.get(obj)).getId());
 					
 	        		for(String fieldName : fieldsForExport) {
-	        			Field thisField = findUnderlyingField(obj.getClass(), fieldName);	        			
+	        			Field thisField = findUnderlyingField(obj.getClass(), fieldName);
 	        			thisField.setAccessible(true);
 	        			Object value = thisField.get(obj);
+		            	bufferWriter.append(delimiter);
 	        			if(value == null) {
 	        				bufferWriter.append("null");
 	        			}
 	        			else {
-	        				bufferWriter.append(value.toString());	
+	        				bufferWriter.append(value.toString());
 	        			}
-		            	bufferWriter.append(delimiter);
 	        		}
 	        	}
 			}

From 8bda987795acc960f47ccc99b3701d4c24f8cb5d Mon Sep 17 00:00:00 2001
From: Andy Baxter <andrewbaxter439@gmail.com>
Date: Mon, 1 Sep 2025 13:40:04 +0100
Subject: [PATCH 2/3] updated to all locations - header and data

---
 .../src/main/java/microsim/data/ExportCSV.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/microsim-core/src/main/java/microsim/data/ExportCSV.java b/microsim-core/src/main/java/microsim/data/ExportCSV.java
index 784edf89..555747a9 100644
--- a/microsim-core/src/main/java/microsim/data/ExportCSV.java
+++ b/microsim-core/src/main/java/microsim/data/ExportCSV.java
@@ -128,7 +128,7 @@ else throw new IllegalArgumentException("Object of type "
         	if(!fAlreadyExists)
         	{
 	    	    //Create Header line for .csv file
-	    	  	bufferWriter.append("run" + delimiter + "time" + delimiter + "id_" + filename + delimiter);
+	    	  	bufferWriter.append("run" + delimiter + "time" + delimiter + "id_" + filename);
         	}
         	
     	    //Create alphabetically sorted (except for run, time and id key) list of fields including private and inherited fields that belong to the target class.
@@ -170,7 +170,7 @@ else throw new IllegalArgumentException("Object of type "
     	    for(String fieldNames : nonTransientFieldNames) {		//Iterated in correct order
     	    	fieldsForExport.add(fieldNames);
     	    	if(!fAlreadyExists) {
-    	    		bufferWriter.append(fieldNames + delimiter);
+    	    		bufferWriter.append(delimiter + fieldNames);
     	    	}
     	    }
         	        	        	
@@ -210,7 +210,7 @@ public void dumpToCSV() {
 	        		
 	        		Field idField = obj.getClass().getDeclaredField(idFieldName);
 	        		idField.setAccessible(true);
-					bufferWriter.append((char) ((PanelEntityKey)idField.get(obj)).getId());
+					bufferWriter.append(String.valueOf(((PanelEntityKey)idField.get(obj)).getId()));
 					
 	        		for(String fieldName : fieldsForExport) {
 	        			Field thisField = findUnderlyingField(obj.getClass(), fieldName);
@@ -232,19 +232,19 @@ else if(targetObject != null) {
         		
 //        		Field idField = targetObject.getClass().getDeclaredField(idFieldName);
 //        		Field idField = targetObjectIdField;
-				bufferWriter.append(((PanelEntityKey)targetObjectIdField.get(targetObject)).getId() + delimiter);
+				bufferWriter.append(String.valueOf(((PanelEntityKey)targetObjectIdField.get(targetObject)).getId()));
 				
         		for(String fieldName : fieldsForExport) {
         			Field thisField = targetObject.getClass().getDeclaredField(fieldName);
         			thisField.setAccessible(true);
         			Object value = thisField.get(targetObject).toString();
+	            	bufferWriter.append(delimiter);
         			if(value == null) {
-        				bufferWriter.append("null");	
+        				bufferWriter.append("null");
         			}
         			else {
-        				bufferWriter.append(value.toString());	
-        			} 
-	            	bufferWriter.append(delimiter);
+        				bufferWriter.append(value.toString());
+        			}
         		}
 			}
 			else throw new NullPointerException("ExportCSV's targetCollection and targetObject fields are both null!  Cannot export to CSV");

From 99ca1d55752cec38aef33c2f88017918008dde83 Mon Sep 17 00:00:00 2001
From: Andy Baxter <andrewbaxter439@gmail.com>
Date: Mon, 1 Sep 2025 13:42:43 +0100
Subject: [PATCH 3/3] removed duplication in pom

---
 microsim-core/pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/microsim-core/pom.xml b/microsim-core/pom.xml
index 0224274e..2f6e3a23 100644
--- a/microsim-core/pom.xml
+++ b/microsim-core/pom.xml
@@ -147,12 +147,6 @@
             <version>3.12.0</version>
             <scope>compile</scope>
         </dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.12.0</version>
-			<scope>compile</scope>
-		</dependency>
 	</dependencies>
 		
 </project>