From cc20767ff06fd0bd6117dd217b066be3457658db Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 2 Mar 2023 11:48:50 +0100 Subject: [PATCH] allow other naming strategies for jgc source --- .../csv/CsvJointGridContainerSource.java | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/ie3/datamodel/io/source/csv/CsvJointGridContainerSource.java b/src/main/java/edu/ie3/datamodel/io/source/csv/CsvJointGridContainerSource.java index ba369f4ac..4ed298741 100644 --- a/src/main/java/edu/ie3/datamodel/io/source/csv/CsvJointGridContainerSource.java +++ b/src/main/java/edu/ie3/datamodel/io/source/csv/CsvJointGridContainerSource.java @@ -17,12 +17,36 @@ public class CsvJointGridContainerSource { private CsvJointGridContainerSource() {} + /** + * Reads CSV files into a {@link JointGridContainer}. Assumes a {@link + * edu.ie3.datamodel.io.naming.FlatDirectoryHierarchy} + * + * @param gridName The grid name + * @param csvSep The csv separator + * @param directoryPath The base directory path + * @return The JointGridContainer + * @throws SourceException in case something went wrong + */ public static JointGridContainer read(String gridName, String csvSep, String directoryPath) throws SourceException { - /* Parameterization */ + FileNamingStrategy fileNamingStrategy = new FileNamingStrategy(); + return read(gridName, csvSep, directoryPath, fileNamingStrategy); + } - FileNamingStrategy namingStrategy = new FileNamingStrategy(); // Default naming strategy + /** + * Reads CSV files into a JointGridContainer. + * + * @param gridName The grid name + * @param csvSep The csv separator + * @param directoryPath The base directory path + * @param namingStrategy The naming strategy + * @return The JointGridContainer + * @throws SourceException in case something went wrong + */ + public static JointGridContainer read( + String gridName, String csvSep, String directoryPath, FileNamingStrategy namingStrategy) + throws SourceException { /* Instantiating sources */ TypeSource typeSource = new CsvTypeSource(csvSep, directoryPath, namingStrategy);