Merge branch 'main' of github.com:mokawi/cLCTM into main

mokawi · Mar 20, 2021 · 9cedce9 · 9cedce9
2 parents db52e51 + ecbe877
commit 9cedce9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/clctm.py b/clctm.py
@@ -593,7 +593,11 @@ def create_neighbor_list():
 
             for w in range(len(corpus.input_ids)):
 
+<<<<<<< HEAD
                 #profprint(f"\n# word {w}")
+=======
+                profprint(f"\n# word {w}")
+>>>>>>> ecbe877c62a0604f42c2f4c4da267e83f45870b1
 
                 doc = corpus.doc_ids[w]
                 z = self.topics[w]