Skip to content

Bugfix/remove trailing commas #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bugfix/remove trailing commas #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b25ba4c
change order of comma adding to prepend each new entry
andrewbaxter439 Sep 1, 2025
8bda987
updated to all locations - header and data
andrewbaxter439 Sep 1, 2025
99ca1d5
removed duplication in pom
andrewbaxter439 Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions microsim-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
22 changes: 11 additions & 11 deletions microsim-core/src/main/java/microsim/data/ExportCSV.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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(String.valueOf(((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);
}
}
}
Expand All @@ -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");
Expand Down