added cex ticker

 Changes to be committed:
	modified:   data.db
	modified:   network.py
	modified:   predict.py
	modified:   util.py

network.py

@@ -46,13 +46,14 @@ def predictFuture(m1,m2,old_pred,writeToFile=False):
     actual = np.array(util.reduceCurrent(actual)).reshape(1,12)
     pred = util.augmentValue(net.predict(actual)[0],m1,m2)
     pred = float(int(pred[0]*100)/100)
+    cex = util.getCEXData()
     if writeToFile:
         f = open("results","a")
         f.write("[{}] Actual:{}$ Last Prediction:{}$ Next 9m:{}$\n".format(time.strftime("%H:%M:%S"),latest_p,old_pred,pred))
         f.close()
 
     c = conn.cursor()
-    c.execute("INSERT INTO predict(actual,last,target) VALUES (?,?,?)",(latest_p,old_pred,pred))
+    c.execute("INSERT INTO predict(actual,last,target,cex_ask) VALUES (?,?,?,?)",(latest_p,old_pred,pred,cex["ask"]))
     conn.commit()
     print("[{}] Actual:{}$ Last Prediction:{}$ Next 9m:{}$".format(time.strftime("%H:%M:%S"),latest_p,old_pred,pred))
     return latest_p,pred

predict.py

@@ -8,17 +8,17 @@
 
 data = pd.read_sql_query("SELECT * from predict", con, index_col="created") 
 
-#print(data.head())
+print(data.tail(2))
 
 start = (datetime.datetime.utcnow() - datetime.timedelta(hours=1)).strftime("%Y-%m-%d %H:%M:%S")
 stop =  datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
-print(start)
-print(stop)
+#print(start)
+#print(stop)
 
 selected = data.loc[(start < data.index) & (data.index < stop),'actual']
-print(selected)
-selected.plot()
-plt.show()
+#print(selected)
+#selected.plot()
+#plt.show()
 
 
 
@@ -32,4 +32,4 @@
 
 plt.plot(selected)
 plt.plot([coefficients[0]*x + coefficients[1] for x in range(len(selected))])
-plt.show()
+plt.show()

util.py

@@ -49,6 +49,7 @@ def reduceCurrent(data):
     return data
 
 def getCurrentData(label=False):
+
   keys = ["price_usd","24h_volume_usd","market_cap_usd","available_supply","total_supply","percent_change_1h","percent_change_24h","percent_change_7d"]
   vect = []
   data = requests.get("https://api.coinmarketcap.com/v1/ticker/bitcoin/").json()[0]
@@ -69,6 +70,12 @@ def getCurrentData(label=False):
   vect.append(float(bkc["USD"]["sell"]))
   vect.append(float(bkc["USD"]["buy"]))
 
+  #print("blockchain.info ",float(bkc["USD"]["15m"]))
   if label:
     return vect,float(bkc["USD"]["15m"])
   return vect
+
+def getCEXData():
+   data = requests.get("https://cex.io/api/ticker/BTC/USD").json()
+   #print("CEX ",data)
+   return data