change structure

cluster.py → clustering/cluster.py

@@ -10,10 +10,10 @@ import click
 from sqlalchemy import delete, func, select, update
 
 from . import app
-from .kshape_filter import KShapeFilter
-from .models import Cluster_result, Nym_info, User_info, db
-from .util import Constants, cnt_cluster
-from .update_ts import fill_ts
+from clustering.kshape_filter import KShapeFilter
+from simulation.models import Cluster_result, Nym_info, User_info, db
+from clustering.util import Constants, cnt_cluster
+from clustering.update_ts import fill_ts
 
 class Clustering:
 

kshape_filter.py → clustering/kshape_filter.py

@@ -3,7 +3,7 @@ import time
 import numpy as np
 import pandas as pd
 from tslearn.clustering import KShape
-from .util import Constants
+from clustering.util import Constants
 
 
 # json to df

client.py → simulation/client.py

@@ -6,8 +6,8 @@ import sys
 
 import requests
 
-from encrypt_message import encrypt_message
-from .util import Constants
+from simulation.encrypt_message import encrypt_message
+from clustering.util import Constants
 
 
 class Client(object):

server.py → simulation/server.py

@@ -7,8 +7,8 @@ from apscheduler.schedulers.background import BackgroundScheduler
 from flask import request
 
 from . import app
-from .models import User_info, db
-from .encrypt_message import decrypt_message
+from simulation.models import User_info, db
+from simulation.encrypt_message import decrypt_message
 
 db.create_all()