logging handling improvements

kit-ifv · Oct 23, 2019 · d32e53d · d32e53d
1 parent 11b7485
commit d32e53d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/main/java/edu/kit/ifv/mobitopp/actitopp/CSVExportLogger.java b/src/main/java/edu/kit/ifv/mobitopp/actitopp/CSVExportLogger.java
@@ -8,6 +8,7 @@
 
 public class CSVExportLogger 
 {
+	File basepath;
 
 	FileWriter activitywriter;
 	FileWriter tripwriter;
@@ -22,21 +23,21 @@ public class CSVExportLogger
 	 */
 	public CSVExportLogger(File basepath) throws IOException
 	{
-		activitywriter = new FileWriter(new File(basepath, "actitopp_activities.csv"));
-		tripwriter = new FileWriter(new File(basepath, "actitopp_trips.csv"));
-		personwriter = new FileWriter(new File(basepath, "actitopp_persons.csv"));
+		this.basepath = basepath;
+		openLogging(false);
 
 		writeActivityData_header();
 		writeTripData_header();
 		writePersonData_header();
+
+		closeLogging();
 	}
-
 
 	public void writeLogging(HashMap<Integer,?> maptoexport) throws IOException
 	{
+		openLogging(true);
 		for(Object referenceobject : maptoexport.values())
-    {
-
+    {  		
 			// Householdmap
 			if (referenceobject instanceof ActiToppHousehold)
 			{
@@ -45,18 +46,26 @@ public void writeLogging(HashMap<Integer,?> maptoexport) throws IOException
 				{
 					exportsinglePerson(actperson);					
 				}
-			}
-
+			}			
 			// Personmap
 			if (referenceobject instanceof ActitoppPerson)
 			{
 				ActitoppPerson actperson = ((ActitoppPerson) referenceobject);
 				exportsinglePerson(actperson);	
 			}
 		}
+		closeLogging();
+	}
+
+
+	private void openLogging(boolean appendToExistingFile) throws IOException  
+	{
+		activitywriter = new FileWriter(new File(basepath, "actitopp_activities.csv"), appendToExistingFile);
+		tripwriter = new FileWriter(new File(basepath, "actitopp_trips.csv"), appendToExistingFile);
+		personwriter = new FileWriter(new File(basepath, "actitopp_persons.csv"), appendToExistingFile);
 	}
 
-	public void closeLogging() throws IOException  
+	private void closeLogging() throws IOException  
 	{
 		activitywriter.close();
 		tripwriter.close();

diff --git a/src/main/java/edu/kit/ifv/mobitopp/actitopp/demo/ExampleActiTopp.java b/src/main/java/edu/kit/ifv/mobitopp/actitopp/demo/ExampleActiTopp.java
@@ -338,7 +338,6 @@ public static void createAndModelMultiplePersons_Example2()
 			// Output information as csv files
 			CSVExportLogger logger = new CSVExportLogger(new File ("D:"));
 			logger.writeLogging(householdmap);
-			logger.closeLogging();
 		}
 		catch (IOException e)
 		{