Merge remote-tracking branch 'origin/excise_reindex' into temp

diff --git a/__init__.py b/__init__.py
new file mode 100644 (file)
index 0000000..dbb8061
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,2 @@
+from .timeseries import load_clusters, load_densities, build_cluster_timeseries
+

diff --git a/timeseries/__init__.py b/timeseries/__init__.py
new file mode 100644 (file)
index 0000000..c023c66
--- /dev/null
+++ b/timeseries/__init__.py
@@ -0,0 +1,2 @@
+from .choose_clusters import load_clusters, load_densities
+from .cluster_timeseries import build_cluster_timeseries

diff --git a/timeseries/cluster_timeseries.py b/timeseries/cluster_timeseries.py
index 07507d74c037ca870bc57e83357d8847d9506a46..91fa705af34f4242d05f8e7d28e4d212e0fc1419 100644 (file)
--- a/timeseries/cluster_timeseries.py
+++ b/timeseries/cluster_timeseries.py
@@ -2,11 +2,11 @@ import pandas as pd
 import numpy as np
 from pyspark.sql import functions as f
 from pyspark.sql import SparkSession
-from choose_clusters import load_clusters, load_densities
+from .choose_clusters import load_clusters, load_densities
 import fire
 from pathlib import Path
 
-def main(term_clusters_path="/gscratch/comdata/output/reddit_clustering/comment_terms_10000.feather",
+def build_cluster_timeseries(term_clusters_path="/gscratch/comdata/output/reddit_clustering/comment_terms_10000.feather",
          author_clusters_path="/gscratch/comdata/output/reddit_clustering/comment_authors_10000.feather",
          term_densities_path="/gscratch/comdata/output/reddit_density/comment_terms_10000.feather",
          author_densities_path="/gscratch/comdata/output/reddit_density/comment_authors_10000.feather",
@@ -34,4 +34,4 @@ def main(term_clusters_path="/gscratch/comdata/output/reddit_clustering/comment_
     ts.write.parquet(output, mode='overwrite')
 
 if __name__ == "__main__":
-    fire.Fire(main)
+    fire.Fire(build_cluster_timeseries)