Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
e6065c9
Removed redis source code
agl29 Feb 12, 2018
8fbb359
Removing extra files and try to Give appropriate naming of function a…
agl29 Feb 12, 2018
e48ab88
trying to resolve conflict
agl29 Feb 12, 2018
8fad8bd
Merge branch 'agi29-server_branch'
agl29 Feb 12, 2018
c75eadf
conflicts resolved
agl29 Feb 12, 2018
b754213
lolz
agl29 Feb 23, 2018
3c9c5b6
Merge https://github.com/pyaf/btech_project
agl29 Feb 23, 2018
e4a292b
templet changes()
agl29 Mar 23, 2018
20f525d
Merge branch 'master' of https://github.com/pyaf/btech_project
agl29 Mar 23, 2018
74c5d03
adding SMAVG and WMAVG
agl29 Mar 26, 2018
449b01b
adding scrap.py for updating database
agl29 Mar 26, 2018
1c91b83
Merge branch 'master' into master
agl29 Mar 26, 2018
dcaa05f
fix datetime object
agl29 Mar 26, 2018
f716055
fix datetime object in load_data
agl29 Mar 26, 2018
b9eea8b
Merge branch 'master' of https://github.com/agl29/btech_project
agl29 Mar 26, 2018
363ad23
fix date time object in load_data
agl29 Mar 26, 2018
a290550
x y replaced in csv files
agl29 Mar 27, 2018
fc90497
some correction in automatic database filling code i.e. tasks and vie…
agl29 Mar 29, 2018
76e2525
Merge branch 'master' into master
agl29 Mar 29, 2018
76dc783
changing updating time after 25 min and None value in load
agl29 Mar 29, 2018
fedb1e4
Merge branch 'master' of https://github.com/agl29/btech_project
agl29 Mar 29, 2018
22d13f2
Merge branch 'master' into master
agl29 Mar 29, 2018
40f41c9
adding SES and modify load_data
agl29 Mar 30, 2018
efdd2c8
indentation
agl29 Mar 30, 2018
3bfb3d1
nothing no
agl29 Mar 30, 2018
d9b678c
ses
agl29 Mar 30, 2018
10554f7
Merge branch 'master' into master
agl29 Mar 30, 2018
9d9939d
load_data
agl29 Mar 31, 2018
8b63a4a
after mysql setup
agl29 Mar 31, 2018
a84bb6e
Merge branch 'master' of https://github.com/pyaf/btech_project
agl29 Mar 31, 2018
31823d5
Bug fixed in load_data file
agl29 Mar 31, 2018
0af28cb
space char error in swag.tasks
agl29 Mar 31, 2018
39e6f9d
adding html table for rmse
agl29 Apr 5, 2018
994449f
server/celerybeat.pid in gitignore
agl29 Apr 5, 2018
e4cc729
conflicts in server/celerybeat.pid
agl29 Apr 5, 2018
04c9d30
name changing of algorithms
agl29 May 2, 2018
04aef6e
Merge branch 'master' into master
agl29 May 2, 2018
56c5fdc
name changing of algorithms
agl29 May 2, 2018
80332a2
Merge branch 'master' of https://github.com/agl29/btech_project
agl29 May 2, 2018
e3f440f
front end name changing
agl29 May 2, 2018
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/swag/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ def forecasted_plot(request):
# print(last[1])
# print(q)
weights = [0.8019, 0.0426, 0.0226, -0.0169, 0.1497]
weights_load = ['Forecasted with WMAVG']
simple_load = ['Forecasted with SMAVG']
weights_load = ['Forecasted with WMA']
simple_load = ['Forecasted with SMA']
for i in range(1,289):
init = 0
init1 = 0
Expand Down
18 changes: 9 additions & 9 deletions server/tamplates/Home_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,21 +78,21 @@
</nav>

<br>
<h1>Today Delhi's Load and Forecasted Load plots </h1>
<h1>Delhi's Real Time Load and Forecasted plots </h1>
<!-- <button id="kp">Sub</button> -->
<div id ="ope"></div>
<table align='center'>
<thead>
<tr>
<th>Features</th>
<th>SMAG</th>
<th>WMAG</th>
<th>SMA</th>
<th>WMA</th>
<th>SES</th>
</tr>
</thead>
<tbody>
<tr>
<td>RMSE(in MW)</td>
<td>RMSE (in MW)</td>
<td colspan="1" id='smavg'>Wait</td>
<td colspan="1" id='wmavg'>Wait</td>
<td colspan="1" id='ses'>Wait</td>
Expand Down Expand Up @@ -284,7 +284,7 @@ <h1>Today Delhi's Load and Forecasted Load plots </h1>
<!-- <form> -->
<br>

<h1 id="w"> Datewise Delhi Load Plots</h1>
<h1 id="w"> Date wise Delhi's Load Plots</h1>

<p>
From:<input type="date" id="from" required="true">
Expand All @@ -295,7 +295,7 @@ <h1 id="w"> Datewise Delhi Load Plots</h1>
<div id ="d"></div>
<script src = "/static/main.js"></script>

<h1 id="q">Forecasting Graph and Comparison</h1>
<h1 id="q">Comparison of Forecasted Graphs</h1>

<p>
Date:<input type="date" id="fc" required="true">
Expand All @@ -307,14 +307,14 @@ <h1 id="q">Forecasting Graph and Comparison</h1>
<thead>
<tr>
<th>Features</th>
<th>SMAG</th>
<th>WMAG</th>
<th>SMA</th>
<th>WMA</th>
<th>SES</th>
</tr>
</thead>
<tbody>
<tr>
<td>RMSE(in MW)</td>
<td>RMSE (in MW)</td>
<td colspan="1" id='smavg1'>Choose a Date</td>
<td colspan="1" id='wmavg1'>Choose a Date</td>
<td colspan="1" id='ses1'>Choose a Date</td>
Expand Down