X-Git-Url: https://code.communitydata.science/cdsc_reddit.git/blobdiff_plain/582cf263eaec21a7c337400c5f601107318ab0f2..07b0dff9bc0dae2ab6f7fb7334007a5269a512ad:/clustering/lsi_base.py

diff --git a/clustering/lsi_base.py b/clustering/lsi_base.py
index f07bca6..84dfa7b 100644
--- a/clustering/lsi_base.py
+++ b/clustering/lsi_base.py
@@ -1,5 +1,5 @@
 from clustering_base import clustering_job, clustering_result
-from grid_sweep import grid_sweep
+from grid_sweep import grid_sweep, twoway_grid_sweep
 from dataclasses import dataclass
 from itertools import chain
 from pathlib import Path
@@ -18,11 +18,27 @@ class lsi_grid_sweep(grid_sweep):
         self.subsweep = subsweep
         inpath = Path(inpath)
         if lsi_dimensions == 'all':
-            lsi_paths = list(inpath.glob("*"))
+            lsi_paths = list(inpath.glob("*.feather"))
         else:
             lsi_paths = [inpath / (str(dim) + '.feather') for dim in lsi_dimensions]
 
+        print(lsi_paths)
         lsi_nums = [int(p.stem) for p in lsi_paths]
         self.hasrun = False
         self.subgrids = [self.subsweep(lsi_path, outpath,  lsi_dim, *args, **kwargs) for lsi_dim, lsi_path in zip(lsi_nums, lsi_paths)]
         self.jobs = list(chain(*map(lambda gs: gs.jobs, self.subgrids)))
+
+class twoway_lsi_grid_sweep(twoway_grid_sweep):
+    def __init__(self, jobtype, subsweep, inpath, lsi_dimensions, outpath, args1, args2):
+        self.jobtype = jobtype
+        self.subsweep = subsweep
+        inpath = Path(inpath)
+        if lsi_dimensions == 'all':
+            lsi_paths = list(inpath.glob("*.feather"))
+        else:
+            lsi_paths = [inpath / (str(dim) + '.feather') for dim in lsi_dimensions]
+
+        lsi_nums = [int(p.stem) for p in lsi_paths]
+        self.hasrun = False
+        self.subgrids = [self.subsweep(lsi_path, outpath, lsi_dim, args1, args2) for lsi_dim, lsi_path in zip(lsi_nums, lsi_paths)]
+        self.jobs = list(chain(*map(lambda gs: gs.jobs, self.subgrids)))