thermokarst/akindices
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No more numpy

Browse source
This commit is contained in:
Matthew Dillon 2015-10-10 13:27:03 -07:00
parent c55ab31671
commit 45e1340c35
4 changed files with 41 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -19,8 +19,7 @@ Prerequisites
- SQLAlchemy (0.8.2) - SQLAlchemy (0.8.2)
- psycopg2 (2.5.1) - psycopg2 (2.5.1)
- flask-wtf (0.9.1) - flask-wtf (0.9.1)
- numpy (1.7.1) - PostgreSQL (9.4+)
- PostgreSQL
Installation Installation

52
app/main/templates/main/details.html
View file

@ -14,37 +14,37 @@
<table class="table table-hover table-condensed table-bordered"> <table class="table table-hover table-condensed table-bordered">
<thead> <thead>
<tr> <tr>
<th>Year<br>&nbsp;</th> <th class="col-md-1">Year<br>&nbsp;</th>
<th>January<br>&deg;C</th> <th class="col-md-1">January<br>&deg;C</th>
<th>February<br>&deg;C</th> <th class="col-md-1">February<br>&deg;C</th>
<th>March<br>&deg;C</th> <th class="col-md-1">March<br>&deg;C</th>
<th>April<br>&deg;C</th> <th class="col-md-1">April<br>&deg;C</th>
<th>May<br>&deg;C</th> <th class="col-md-1">May<br>&deg;C</th>
<th>June<br>&deg;C</th> <th class="col-md-1">June<br>&deg;C</th>
<th>July<br>&deg;C</th> <th class="col-md-1">July<br>&deg;C</th>
<th>August<br>&deg;C</th> <th class="col-md-1">August<br>&deg;C</th>
<th>September<br>&deg;C</th> <th class="col-md-1">September<br>&deg;C</th>
<th>October<br>&deg;C</th> <th class="col-md-1">October<br>&deg;C</th>
<th>November<br>&deg;C</th> <th class="col-md-1">November<br>&deg;C</th>
<th>December<br>&deg;C</th> <th class="col-md-1">December<br>&deg;C</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for temp in temps %} {% for temp in temps %}
<tr> <tr>
<td>{{ temp[0]|int }}</td> <td>{{ temp[0] }}</td>
<td>{{ temp[1]|round(2) }}</td> <td>{{ temp[1][0] }}</td>
<td>{{ temp[2]|round(2) }}</td> <td>{{ temp[1][1] }}</td>
<td>{{ temp[3]|round(2) }}</td> <td>{{ temp[1][2] }}</td>
<td>{{ temp[4]|round(2) }}</td> <td>{{ temp[1][3] }}</td>
<td>{{ temp[5]|round(2) }}</td> <td>{{ temp[1][4] }}</td>
<td>{{ temp[6]|round(2) }}</td> <td>{{ temp[1][5] }}</td>
<td>{{ temp[7]|round(2) }}</td> <td>{{ temp[1][6] }}</td>
<td>{{ temp[8]|round(2) }}</td> <td>{{ temp[1][7] }}</td>
<td>{{ temp[9]|round(2) }}</td> <td>{{ temp[1][8] }}</td>
<td>{{ temp[10]|round(2) }}</td> <td>{{ temp[1][9] }}</td>
<td>{{ temp[11]|round(2) }}</td> <td>{{ temp[1][10] }}</td>
<td>{{ temp[12]|round(2) }}</td> <td>{{ temp[1][11] }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>

27
app/main/utils.py
View file

@ -1,5 +1,3 @@
import numpy
from .models import DB from .models import DB
@ -23,8 +21,7 @@ def avg_air_temp(temps):
def ann_air_indices(temps): def ann_air_indices(temps):
ATI, AFI = 0.0, 0.0 ATI, AFI = 0.0, 0.0
# TODO: drop numpy indices = [[0 for x in range(2)] for y in range(len(temps))]
indices = numpy.zeros((len(temps), 2), dtype='int')
months = [0.0 for m in range(12)] months = [0.0 for m in range(12)]
days = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] days = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
i = 0 i = 0
@ -39,25 +36,27 @@ def ann_air_indices(temps):
ATI = ATI + ind ATI = ATI + ind
else: else:
AFI = AFI + ind AFI = AFI + ind
indices[i, 0], indices[i, 1] = int(ATI), int(AFI) indices[i][0], indices[i][1] = int(ATI), int(AFI)
ATI, AFI = 0.0, 0.0 ATI, AFI = 0.0, 0.0
i += 1 i += 1
return indices return indices
def avg_air_indices(indices): def avg_air_indices(indices):
# TODO: drop numpy year_counter, total_freezing, total_thawing = 0, 0, 0
temp = numpy.average(indices, axis=0) for index in indices:
return (int(temp[0]), int(temp[1])) total_thawing += index[0]
total_freezing += index[1]
year_counter += 1
return (int(total_thawing / year_counter), int(total_freezing / year_counter))
def des_air_indices(indices): def des_air_indices(indices):
if indices.shape[0] > 2: if len(indices) > 2:
# TODO: drop numpy ati = sorted(indices, key=lambda arr: arr[0])
ati = numpy.sort(indices[:, 0]) afi = sorted(indices, key=lambda arr: arr[1])
afi = numpy.sort(indices[:, 1]) dti = (ati[-1][0] + ati[-2][0] + ati[-3][0]) / 3.0
dti = (ati[-1] + ati[-2] + ati[-3]) / 3.0 dfi = (afi[0][1] + afi[1][1] + afi[2][1]) / 3.0
dfi = (afi[0] + afi[1] + afi[2]) / 3.0
return (int(dti), int(dfi)) return (int(dti), int(dfi))
else: else:
return (None, None) return (None, None)

7
app/main/views.py
View file

@ -1,5 +1,3 @@
from numpy import arange, hstack
from flask import session, render_template, request, redirect, url_for from flask import session, render_template, request, redirect, url_for
from . import main from . import main
@ -76,10 +74,7 @@ def details():
community_id = request.args.get('community_id', '') community_id = request.args.get('community_id', '')
minyear = request.args.get('minyear', '') minyear = request.args.get('minyear', '')
maxyear = request.args.get('maxyear', '') maxyear = request.args.get('maxyear', '')
temps = getTemps(datasets, community_id, minyear, maxyear) temps = getTemps(session)
years = arange(int(minyear),
int(maxyear)+1).reshape(int(maxyear)-int(minyear) + 1, 1)
temps = hstack((years, temps))
return render_template('main/details.html', return render_template('main/details.html',
lat=request.args.get('lat', ''), lat=request.args.get('lat', ''),
lon=request.args.get('lon', ''), lon=request.args.get('lon', ''),