Commit 70ced994 authored by Chris's avatar Chris
Browse files

Merge remote-tracking branch 'origin/development' into development

parents 639573d9 b5d19287
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@
X_train = []
Y_train = []
import preprocess

def preprocessing():
    XYList = preproces.loadXY()
    XYList = preprocess.loadXY()
    X_train = XYList[0]
    Y_train = XYList[1]

+39 −29
Original line number Diff line number Diff line
import numpy as np
import pandas as pd
import re
import os
from collections import Counter
import xml.etree.ElementTree
from joblib import dump, load
@@ -95,7 +96,7 @@ def prepare(features, data):
##############################################################################################################################################
#read in training and testing data
#kaggle and UCI contain the same data

def read_data():
    data = pd.read_csv('UCI.csv', header=None).drop(2, axis=1)
    data = data.drop_duplicates()
    
@@ -124,7 +125,16 @@ dump(features, 'features.joblib')
    
    #create feature matrix for training and testing data
    X, Y = prepare(features, data)
    dump(X, 'X.joblib')
    dump(Y, 'Y.joblib')


# for API
def loadXY():
    return [X, Y]
 No newline at end of file
    if not os.path.isfile('X.joblib') or not os.path.isfile('Y.joblib'):
        read_data()
    
    X = load('X.joblib')
    Y = load('Y.joblib')
    
    return X, Y
+3 −2
Original line number Diff line number Diff line
@@ -2,14 +2,15 @@
import ml

# Flask import
from flask import Flask
from flask import Flask, send_from_directory
app = Flask(__name__)


@app.route('/')
@app.route('/index')
def display_greeting():
    return "Hey!"
    #return contents of /web/index.html
    return send_from_directory('web', 'index.html')


# Run the app!