Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion RCaller/settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rootprojectt.name = 'RCaller'
rootProject.name = 'RCaller'
14 changes: 11 additions & 3 deletions RCaller/src/main/java/com/github/rcaller/io/CSVFileWriter.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,28 @@

import com.github.rcaller.datatypes.DataFrame;

import java.io.File;
import java.io.FileWriter;
import java.io.IOException;

public class CSVFileWriter extends FileWriter{

private CSVFileWriter(String filePath) throws IOException {
private CSVFileWriter(final String filePath) throws IOException {
super(filePath);
}

public static CSVFileWriter create(String filePath) throws IOException {
private CSVFileWriter(final File file) throws IOException {
super(file);
}

public static CSVFileWriter create(final String filePath) throws IOException {
return new CSVFileWriter(filePath);
}

public static CSVFileWriter create(final File file) throws IOException {
return new CSVFileWriter(file);
}

public void writeDataFrameToFile(DataFrame dataFrame) throws IOException {
appendArray(dataFrame.getNames());
for (int i = 0; i < dataFrame.getNumberOfRows(); i++) {
Expand All @@ -35,5 +44,4 @@ private void appendArray(Object[] array) throws IOException {
this.flush();
}


}
11 changes: 4 additions & 7 deletions RCaller/src/main/java/com/github/rcaller/util/RCodeUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@
import com.github.rcaller.scriptengine.LanguageElement;
import org.apache.commons.lang3.ArrayUtils;

import java.io.File;
import java.io.IOException;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.*;
import java.util.logging.Level;
import java.util.logging.Logger;

Expand Down Expand Up @@ -211,8 +207,9 @@ public static void addRespectToType(StringBuilder rCode, String name, Object o,
public static void addDataFrame(StringBuilder rCode, String name, DataFrame dataFrame) {
try {
File file = File.createTempFile("dataFrame", ".csv");
CSVFileWriter csvFileWriter = CSVFileWriter.create(file.getAbsolutePath());
csvFileWriter.writeDataFrameToFile(dataFrame);
try (CSVFileWriter csvFileWriter = CSVFileWriter.create(file)) {
csvFileWriter.writeDataFrameToFile(dataFrame);
}
rCode.append(name).append(" <- read.csv(\"").append(Globals.getSystemSpecificRPathParameter(file)).append("\")\n");

} catch (IOException e) {
Expand Down
Loading