diff --git a/lib/python/GEODE/__init__.py b/lib/python/GEODE/__init__.py index d03473a4d3ca000247d479430664bc6e67d9404e..412051036790c126bf15f790fdbd5db906e24ba7 100644 --- a/lib/python/GEODE/__init__.py +++ b/lib/python/GEODE/__init__.py @@ -1,4 +1,4 @@ from GEODE.Classification import discursiveFunctions from GEODE.Metadata import article, paragraph, fromKey, relativePath, toKey, uid -from GEODE.store import corpus, Directory, SelfContained, toTSV +from GEODE.store import corpus, Directory, fromTSV, SelfContained, toTSV from GEODE.Visualisation import heatmap diff --git a/lib/python/GEODE/store/Corpus.py b/lib/python/GEODE/store/Corpus.py index e72b8b60fb9a8cd5f18caa54d817c170c295e2e5..0e16bd0f0d203bdbc5171f4b340b5f757c522809 100644 --- a/lib/python/GEODE/store/Corpus.py +++ b/lib/python/GEODE/store/Corpus.py @@ -1,5 +1,5 @@ from GEODE.Metadata import fromKey, relativePath -from GEODE.store.TSV import toTSV +from GEODE.store.TSV import fromTSV, toTSV import pandas from os import makedirs from os.path import dirname, isdir @@ -37,7 +37,7 @@ class TSVIndexed(Corpus): def load(self): if self.data is None: - self.data = pandas.read_csv(self.tsv_path, sep='\t') + self.data = fromTSV(self.tsv_path) self.detect_keys() self.data = self.data.set_index(self.keys, drop=False) diff --git a/lib/python/GEODE/store/TSV.py b/lib/python/GEODE/store/TSV.py index 3967be3a13e1f658c26c39e972c843084f0fdac0..312631c4a0c1d040c5f36ce9fae7af548cf42d47 100644 --- a/lib/python/GEODE/store/TSV.py +++ b/lib/python/GEODE/store/TSV.py @@ -22,3 +22,6 @@ def toTSV(filePath, data, sortBy='toStrKey'): else: sortedData = data.sort_index(key=forPanda(data, sortBy)) sortedData.to_csv(filePath, sep='\t', index=False) + +def fromTSV(filePath): + return pandas.read_csv(filePath, sep='\t') diff --git a/lib/python/GEODE/store/__init__.py b/lib/python/GEODE/store/__init__.py index ebbd38d9b3dac61626996636728c1089c8c5938a..d4a85f0472bbc8800a824e06af279b13861f5c58 100644 --- a/lib/python/GEODE/store/__init__.py +++ b/lib/python/GEODE/store/__init__.py @@ -1,5 +1,5 @@ from GEODE.store.Corpus import corpus, Directory, SelfContained -from GEODE.store.TSV import toTSV +from GEODE.store.TSV import fromTSV, toTSV import os import os.path