From 06fa57ac5c02f742ab47ffa3e2315e2bddb75d01 Mon Sep 17 00:00:00 2001 From: Clement Miao Date: Wed, 12 Mar 2014 22:14:34 -0500 Subject: [PATCH] merge --- chicago_api/settings.py | 2 +- chicago_api/settings.py.orig | 138 -------------------- chicago_api/urls.py | 1 - db.sqlite3 | Bin 107520 -> 112640 bytes gmap/admin.py | 6 - gmap/models.py | 11 -- gmap/templates/gmap/map_sentiment.html | 67 ---------- requirements.txt | 3 +- social_data/insta.py.orig | 70 ---------- social_data/nlp.py | 83 ------------ social_data/templates/social_data/base.html | 3 - 11 files changed, 2 insertions(+), 382 deletions(-) delete mode 100644 chicago_api/settings.py.orig delete mode 100644 social_data/insta.py.orig diff --git a/chicago_api/settings.py b/chicago_api/settings.py index ba19519..c2cf44c 100644 --- a/chicago_api/settings.py +++ b/chicago_api/settings.py @@ -110,7 +110,7 @@ # Parse database configuration from $DATABASE_URL import dj_database_url -# DATABASES['default'] = dj_database_url.config()p +# DATABASES['default'] = dj_database_url.config() diff --git a/chicago_api/settings.py.orig b/chicago_api/settings.py.orig deleted file mode 100644 index 7250478..0000000 --- a/chicago_api/settings.py.orig +++ /dev/null @@ -1,138 +0,0 @@ -""" -Django settings for chicago_api project. - -For more information on this file, see -https://docs.djangoproject.com/en/1.6/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/1.6/ref/settings/ -""" - -# Build paths inside the project like this: os.path.join(BASE_DIR, ...) -import os -BASE_DIR = os.path.dirname(os.path.dirname(__file__)) - - -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = '!q-=6sgdrggdd$@)!6y5-cjy9ug+!umw#4f&%1(23wqx9$9g1@' - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -TEMPLATE_DEBUG = True - -ALLOWED_HOSTS = [] - - -# Application definition - -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', -# 'django.template.loaders.eggs.Loader', -) - -TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. - os.path.join(BASE_DIR, 'templates'), - # os.path.join(BASE_DIR, '/chicago_api/templates'), -) - -INSTALLED_APPS = ( - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'gmap', - 'chicago_api', - 'social_data', - # 'south', -) - -MIDDLEWARE_CLASSES = ( - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', -) - -ROOT_URLCONF = 'chicago_api.urls' - -WSGI_APPLICATION = 'chicago_api.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/1.6/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - } - } - -<<<<<<< HEAD -# DATABASES = { -# 'default': { -# 'ENGINE': 'django.db.backends.postgresql_psycopg2', -# 'NAME': 'chicago_api', -# 'USER': 'clementmiao', -# } -# } -======= - ->>>>>>> e8b25ea855f0fa7de558e1bce5ba58fdbfd4e77b - -# Internationalization -# https://docs.djangoproject.com/en/1.6/topics/i18n/ - -LANGUAGE_CODE = 'en-us' - -TIME_ZONE = 'America/Chicago' - -USE_I18N = True - -USE_L10N = True - -USE_TZ = True - -# SOUTH_TESTS_MIGRATE = False - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/1.6/howto/static-files/ - -STATIC_URL = '/static/' - -# Parse database configuration from $DATABASE_URL -import dj_database_url -DATABASES['default'] = dj_database_url.config() - -# DATABASES = {'default': dj_database_url.config()} -# DATABASES = {'default': dj_database_url.config(default='postgres://pgddcfmpztaggy:55_6JhtdTBVJWhUdE5Dxu99lyb@ec2-54-197-227-238.compute-1.amazonaws.com:5432/d3hqtt3qjo674c')} - - -# Honor the 'X-Forwarded-Proto' header for request.is_secure() -SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') - -# Allow all host headers -ALLOWED_HOSTS = ['*'] - -# Static asset configuration -# import os -# BASE_DIR = os.path.dirname(os.path.abspath(__file__)) -# STATIC_ROOT = 'staticfiles' -# STATIC_URL = '/static/' - -# STATICFILES_DIRS = ( -# os.path.join(BASE_DIR, 'static'), -# ) diff --git a/chicago_api/urls.py b/chicago_api/urls.py index 1705660..350296c 100644 --- a/chicago_api/urls.py +++ b/chicago_api/urls.py @@ -7,7 +7,6 @@ urlpatterns = patterns('', # Examples: url(r'^$', 'chicago_api.views.home', name='home'), - # url(r'^blog/', include('blog.urls')), url(r'^gmap/', include('gmap.urls')), url(r'^admin/', include(admin.site.urls)), url(r'^social_data/',include('social_data.urls')), diff --git a/db.sqlite3 b/db.sqlite3 index 93dd4ed93ec37e2357b79f17f3a5e0030ad55c97..82cf093de5a79a31929c70d657cc3907eeeb98c7 100644 GIT binary patch delta 5089 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 diff --git a/gmap/admin.py b/gmap/admin.py index 9075ca4..694323f 100644 --- a/gmap/admin.py +++ b/gmap/admin.py @@ -1,7 +1 @@ from django.contrib import admin -# from gmap.models import Location - -# class LocationAdmin(admin.ModelAdmin): -# fields = ['longitude','latitude'] - -# admin.site.register(Location, LocationAdmin) diff --git a/gmap/models.py b/gmap/models.py index f7394f2..137941f 100644 --- a/gmap/models.py +++ b/gmap/models.py @@ -1,12 +1 @@ from django.db import models - -# class Location(models.Model): - -# longitude = models.CharField(max_length=200) -# latitude = models.CharField(max_length=200) -# # summary = models.CharField(max_length=200) - -# def __unicode__(self): -# string = "longitude: %s; latitude: %s" % (self.longitude, self.latitude) -# return string - diff --git a/gmap/templates/gmap/map_sentiment.html b/gmap/templates/gmap/map_sentiment.html index d666a48..dad8e99 100644 --- a/gmap/templates/gmap/map_sentiment.html +++ b/gmap/templates/gmap/map_sentiment.html @@ -15,7 +15,6 @@ var myParser; - // window.onload = function() { function initialize() { var lat_long = new google.maps.LatLng({{latitude}}, {{longitude}}); var mapOptions = { @@ -32,49 +31,6 @@ myParser.parse(kml); heat_data = [] - {% if data %} - - function createMarker(latitude, longitude, string, icon, image) { - var marker = new google.maps.Marker({ - position: new google.maps.LatLng(latitude, longitude), - map: map, - icon: icon, - animation: google.maps.Animation.DROP, - }) - var contentString = string; - - if (image != "") { - contentString = '' + contentString - } - - var infoWindow = new google.maps.InfoWindow({ - content: contentString - }); - - google.maps.event.addListener(marker, 'click', function() { - infoWindow.open(map,marker); - }); - } - - - - // myParser.parse(kml); - - - // {% for p in data %} - - // createMarker({{p.latitude}},{{p.longitude}}, "{{p.title|escapejs}}", "{{p.icon}}", "{{p.image}}"); - - // var item = new google.maps.LatLng({{p.latitude}}, {{p.longitude}}); - // heat_data.push(item); - - // {% endfor %} - - // var pointArray = new google.maps.MVCArray(heat_data); - - - - {% endif %} } @@ -93,9 +49,6 @@ if (sentiment == "positive") { counter = counter + 1 } - // polygon.setOptions({fillColor: "blue", fillOpacity: 0.20}); - // window.alert("hello world"); - } @@ -120,23 +73,6 @@ polygon.setOptions({fillColor: "red", fillOpacity: 0.30}) } } - - // {% for p in data %} - // var latitude = {{p.latitude}} - // var longitude = {{p.longitude}} - // var sentiment = "{{p.sentiment}}" - - // var position = new google.maps.LatLng(latitude, longitude) - - // if (google.maps.geometry.poly.containsLocation(position, polygon)) { - - // polygon.setOptions({fillColor: "blue", fillOpacity: 0.30}); - // // window.alert("hello world"); - - // } - // // polygon.setMap(map); - - // {% endfor %} } function sentiment(){ @@ -146,9 +82,6 @@ for (var i = 0; i < arrayLength; i++) { var polygon = myParser.docs[0].gpolygons[i]; getSentiment(polygon); - // polygon.setMap(null); - // polygon.setOptions({fillColor: "blue", fillOpacity: 0.20}) - // polygon.setMap(map); } diff --git a/requirements.txt b/requirements.txt index 7b99d1f..2cf3523 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,5 +10,4 @@ tweepy==2.2 wsgiref==0.1.2 nltk==2.0.4 python-instagram==0.8.0 -facepy==0.9.0 -requests==2.1.0 \ No newline at end of file +facepy==0.9.0 \ No newline at end of file diff --git a/social_data/insta.py.orig b/social_data/insta.py.orig deleted file mode 100644 index 3ea9abe..0000000 --- a/social_data/insta.py.orig +++ /dev/null @@ -1,70 +0,0 @@ -from social_data.models import Service, Post -from instagram.client import InstagramAPI -<<<<<<< HEAD -# import get_access_token -======= -#import get_access_token ->>>>>>> 44445f1b4f88fb80ac4510df023f68c0c5d7b703 -from datetime import datetime -from slistener import SListener -import time, sys -# from python_instagram import get_access_token - -client_id='7fa959a59882475ba2231140f893bdf1' -client_secret='a7b40449a691447bb440add4141ac11e' -access_token ='1124834969.7fa959a.49315f81b2e54d0e83c3dab81ff67794' -api = InstagramAPI(client_id = client_id, client_secret = client_secret) - -# def access(): - -# if len(sys.argv) > 1 and sys.argv[1] == 'local': -# try: - -# InstagramAPI.host = test_host -# InstagramAPI.base_path = test_base_path -# InstagramAPI.access_token_field = "access_token" -# InstagramAPI.authorize_url = test_authorize_url -# InstagramAPI.access_token_url = test_access_token_url -# InstagramAPI.protocol = test_protocol -# except Exception: -# pass - -# client_id = raw_input("Client ID: ").strip() -# client_secret = raw_input("Client Secret: ").strip() -# redirect_uri = raw_input("Redirect URI: ").strip() -# raw_scope = raw_input("Requested scope (separated by spaces, blank for just basic read): ").strip() -# scope = raw_scope.split(' ') -# # For basic, API seems to need to be set explicitly -# if not scope or scope == [""]: -# scope = ["basic"] - -# api = InstagramAPI(client_id=client_id, client_secret=client_secret, redirect_uri=redirect_uri) -# redirect_uri = api.get_authorize_login_url(scope = scope) - -# print "Visit this page and authorize access in your browser:\n", redirect_uri - -# code = raw_input("Paste in code in query string after redirect: ").strip() - -# access_token = api.exchange_code_for_access_token(code) -# print "access token:\n", access_token - -def insta(): - #popular_media = api.media_popular(count=20) - #for media in popular_media: - # print media.images['standard_resolution'].url - l = api.media_search(distance = 5000, lat = 41.8954, lng =-87.6243, access_token = access_token) - #print(l) - s = Service.objects.get(name="instagram") - for x in l: - t = api.media(x.id) - #print(t.caption) - lat = t.location.point.latitude - lon = t.location.point.longitude - #time = datetime.datetime.fromtimestamp(t.caption.created_time) - find = Post.objects.filter(identifier = x.id, service = s) - if len(find) == 0: - post = Post(service = s, latitude = lat, longitude = lon, identifier = t.id, text = "", link = "", image = "", timestamp = t.created_time) - #post.save() - print(post) - - diff --git a/social_data/nlp.py b/social_data/nlp.py index 0cbc40c..57d028f 100644 --- a/social_data/nlp.py +++ b/social_data/nlp.py @@ -50,65 +50,6 @@ def format_string_kaggle(list): return return_list - - - -def process(): - lines_1 = get_list('twitter_data/unigrams-pmilexicon.txt') - lines_2 = get_list('twitter_data/bigrams-pmilexicon.txt') - lines_3 = get_list('twitter_data/bigrams-pmilexicon_2.txt') - lines_4 = get_list('twitter_data/sentimenthashtags.txt') - lines_5 = get_list('twitter_data/unigrams-pmilexicon_2.txt') - lines_6 = get_list('twitter_data/kaggle_data.txt') - # lines = lines_1 + lines_2 + lines_3 + lines_5 - lines = lines_6 - - lines_4 = format_string_2(lines_4) - - # rv = format_string(lines) + lines_4 - rv = format_string_kaggle(lines) - pos_tweets = [] - neg_tweets = [] - - for element in rv: - if element[1] == 'positive': - pos_tweets.append(element) - else: - neg_tweets.append(element) - - tweets = [] - - for (words, sentiment) in pos_tweets + neg_tweets: - words_filtered = [e.lower() for e in words.split()] - tweets.append((words_filtered, sentiment)) - - def get_words_in_tweets(tweets): - all_words = [] - for (words, sentiment) in tweets: - all_words.extend(words) - return all_words - - def get_word_features(wordlist): - wordlist = nltk.FreqDist(wordlist) - word_features = wordlist.keys() - return word_features - - def extract_features(document): - document_words = set(document) - features = {} - for word in word_features: - features['contains(%s)' % word] = (word in document_words) - return features - print "tweets created" - word_features = get_word_features(get_words_in_tweets(tweets)) - print "word features" - training_set = nltk.classify.apply_features(extract_features, tweets) - print "training set" - classifier = nltk.classify.NaiveBayesClassifier.train(training_set) - print "classifier" - return (classifier, word_features) - - def save_classifier(tuple): BASE_DIR = path.dirname(__file__) rel_path = 'my_classifier.pickle' @@ -159,19 +100,10 @@ def intermediary(): lines_4 = format_string_2(lines_4) - # rv = format_string(lines) - - # rv = format_string(lines_2) rv = kaggle length = len(rv) - # cutoff = length * 1/100 - - # rv = rv[:cutoff] - - # rv = rv + kaggle - pos_tweets = [] neg_tweets = [] @@ -193,19 +125,6 @@ def get_corpus(): tweets = intermediary() - - - # trainfeats = negfeats[:negcutoff] + posfeats[:poscutoff] - # testfeats = negfeats[negcutoff:] + posfeats[poscutoff:] - # trainfeats = negfeats + posfeats - - - - - - # print 'accuracy:', nltk.classify.util.accuracy(classifier, testfeats) - # classifier.show_most_informative_features(1000) - wordlist = getwordfeatures(getwords(tweets)) wordlist = [i for i in wordlist if not i in nltk.corpus.stopwords.words('english')] @@ -269,7 +188,6 @@ def save_current(): def process_tweets(): s = Service.objects.get(name="twitter") tweets_list = Post.objects.filter(service=s) - # tup = get_corpus() BASE_DIR = path.dirname(__file__) rel_path = 'my_classifier.pickle' file_path = path.join(BASE_DIR, rel_path) @@ -278,7 +196,6 @@ def process_tweets(): f.close() classifier = tup[0] wordlist = tup[1] - # classifier = process() for x in tweets_list: result = assess_tweet(x.text, classifier, wordlist) senti = Sentiment(post = x, sentiment = result) diff --git a/social_data/templates/social_data/base.html b/social_data/templates/social_data/base.html index 85138c1..a13f575 100644 --- a/social_data/templates/social_data/base.html +++ b/social_data/templates/social_data/base.html @@ -28,9 +28,6 @@ - - -