modified files

kykamath · Feb 1, 2013 · 3602cfe · 3602cfe
1 parent 64563ac
commit 3602cfe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/hashtags_for_locations/analysis_predict_hashtags_for_locations.py b/hashtags_for_locations/analysis_predict_hashtags_for_locations.py
@@ -1179,13 +1179,13 @@ def location_clusters():
 
     @staticmethod
     def run():
-#        PredictHashtagsForLocationsPlots.performance_by_varying_num_of_hashtags()
+        PredictHashtagsForLocationsPlots.performance_by_varying_num_of_hashtags()
 #        PredictHashtagsForLocationsPlots.performance_by_varying_prediction_time_interval()
 #        PredictHashtagsForLocationsPlots.performance_by_varying_historical_time_interval()
 #        PredictHashtagsForLocationsPlots.ccdf_num_of_utmids_where_hashtag_propagates()
 
 #        PredictHashtagsForLocationsPlots.perct_of_hashtag_occurrences_vs_time_of_propagation()
-        PredictHashtagsForLocationsPlots.perct_of_hashtag_occurrences_vs_hashtag_lifespan()
+#        PredictHashtagsForLocationsPlots.perct_of_hashtag_occurrences_vs_hashtag_lifespan()
 
 #        PredictHashtagsForLocationsPlots.perct_of_locations_vs_hashtag_propaagation_time()
 #        PredictHashtagsForLocationsPlots.perct_of_locations_vs_hashtag_lifespan()
@@ -1532,6 +1532,6 @@ def run():
 #                                                                   4)
 
 if __name__ == '__main__':
-    MRAnalysis.run()
-#    PredictHashtagsForLocationsPlots.run()
+#    MRAnalysis.run()
+    PredictHashtagsForLocationsPlots.run()
 #    PerformanceByLocationAnalysis.run()
diff --git a/hashtags_for_locations/mr_predict_hashtags_for_locations_jan_13.py b/hashtags_for_locations/mr_predict_hashtags_for_locations_jan_13.py
@@ -76,7 +76,7 @@ class ModelPerformance(ModifiedMRJob):
     {"impact": 0.643436165267, "model_id": "coverage_distance", "accuracy": 0.642744052605}
     {"impact": 0.62860791449, "model_id": "transmitting_probability", "accuracy": 0.628443667028}
     '''
-    NUM_OF_HASHTAGS = 10
+    NUM_OF_HASHTAGS = 5
     def __init__(self, *args, **kwargs):
         super(ModelPerformance, self).__init__(*args, **kwargs)
         self.hashtags_by_models_by_locations = HashtagsByModelsByLocations(num_of_hashtags=1)