Changes from hyak.

[cdsc_reddit.git] / similarities / cosine_similarities.py

diff --git a/similarities/cosine_similarities.py b/similarities/cosine_similarities.py
index 609e4779673d0fc46aaa901949f605f8554359af..c1e99c99fcba91991997d5171bf35296cc0921cf 100644 (file)
--- a/similarities/cosine_similarities.py
+++ b/similarities/cosine_similarities.py
@@ -1,30 +1,53 @@
 import pandas as pd
 import fire
 from pathlib import Path
-from similarities_helper import similarities
+from similarities_helper import similarities, column_similarities
 
-def cosine_similarities(infile, term_colname, outfile, min_df=None, included_subreddits=None, topN=500, exclude_phrases=False,from_date=None, to_date=None):
-    return similiarities(infile=infile, simfunc=column_similarities, term_colname=term_colname, outfile=outfile, min_df=min_df, included_subreddits=included_subreddits, topN=topN, exclude_phrases=exclude_phrases,from_date=from_date, to_date=to_date)
+def cosine_similarities(infile, term_colname, outfile, min_df=None, max_df=None, included_subreddits=None, topN=500, exclude_phrases=False, from_date=None, to_date=None, tfidf_colname='tf_idf'):
 
-def term_cosine_similarities(outfile, min_df=None, included_subreddits=None, topN=500, exclude_phrases=False, from_date=None, to_date=None):
+    return similarities(infile=infile, simfunc=column_similarities, term_colname=term_colname, outfile=outfile, min_df=min_df, max_df=max_df, included_subreddits=included_subreddits, topN=topN, exclude_phrases=exclude_phrases,from_date=from_date, to_date=to_date, tfidf_colname=tfidf_colname)
+
+
+def term_cosine_similarities(outfile, min_df=None, max_df=None, included_subreddits=None, topN=500, exclude_phrases=False, from_date=None, to_date=None):
     return cosine_similarities('/gscratch/comdata/output/reddit_similarity/tfidf/comment_terms.parquet',
                                'term',
                                outfile,
                                min_df,
+                               max_df,
+                               included_subreddits,
+                               topN,
+                               exclude_phrases,
+                               from_date,
+                               to_date)
+
+def author_cosine_similarities(outfile, min_df=2, max_df=None, included_subreddits=None, topN=10000, from_date=None, to_date=None):
+    return cosine_similarities('/gscratch/comdata/output/reddit_similarity/tfidf/comment_authors.parquet',
+                               'author',
+                               outfile,
+                               min_df,
+                               max_df,
                                included_subreddits,
                                topN,
-                               exclude_phrasesby.)
+                               exclude_phrases=False,
+                               from_date=from_date,
+                               to_date=to_date)
 
-def author_cosine_similarities(outfile, min_df=2, included_subreddits=None, topN=10000, from_date=None, to_date=None):
+def author_tf_similarities(outfile, min_df=2, max_df=None, included_subreddits=None, topN=10000, from_date=None, to_date=None):
     return cosine_similarities('/gscratch/comdata/output/reddit_similarity/tfidf/comment_authors.parquet',
                                'author',
                                outfile,
                                min_df,
+                               max_df,
                                included_subreddits,
                                topN,
-                               exclude_phrases=False)
+                               exclude_phrases=False,
+                               from_date=from_date,
+                               to_date=to_date,
+                               tfidf_colname='relative_tf')
+
 
 if __name__ == "__main__":
     fire.Fire({'term':term_cosine_similarities,
-               'author':author_cosine_similarities})
+               'author':author_cosine_similarities,
+               'author-tf':author_tf_similarities})