Added lsh to git + more documentation

AngularApp/prototype/src/app/labeling-window/labeling-window.component.html

@@ -10,7 +10,7 @@
     </div>
   </div>
   <div class="button-holder">
-    <button *ngIf="show" (click)="updateQuery()" class="train-button">Query</button>
+<!--    <button *ngIf="show" (click)="updateQuery()" class="train-button">Query</button>-->
     <button *ngIf="show" (click)="train()" class="train-button">Train</button>
   </div>
 </div>

AngularApp/prototype/src/app/overview-window/overview-window.component.ts

@@ -28,7 +28,7 @@ export class OverviewWindowComponent implements OnInit {
 
   async initializePlot() {
     this.state.queryWindow = undefined;
-    this.debugClicked();
+    // this.debugClicked();
     this.data = [];
     for (let i = 0; i < this.state.rawData.values.length; i++) {
       this.data.push([this.state.rawData.index[i], this.state.rawData.values[i]]);
@@ -155,6 +155,8 @@ export class OverviewWindowComponent implements OnInit {
       return;
     }
     this.state.querySelectionMode = false;
+    await this.debugClicked();
+    return;
     const xyInformation = zingchart.exec('zingchart-ng-1', 'getxyinfo', {
       x: clickData.x,
       y: clickData.y

AngularApp/prototype/src/app/table-overview/table-overview.component.ts

@@ -12,8 +12,8 @@ export class TableOverviewComponent implements OnInit {
   constructor(private state: StateService) { }
 
   ngOnInit(): void {
-    this.state.onNewTable.subscribe(() => this.createHistograms());
-    this.state.onNewTableInfo.subscribe(() => this.createPrototypes());
+    // this.state.onNewTable.subscribe(() => this.createHistograms());
+    // this.state.onNewTableInfo.subscribe(() => this.createPrototypes());
   }
 
   createPrototypes(): void {

Flaskserver/main.py

@@ -94,6 +94,17 @@ def initialize():
     print('LSH done: ' + str(time()-t0))
     return response
 
+@app.route('/weights', methods=['POST'])
+def weights():
+    raw_data = orjson.loads(request.data)
+    parameters = raw_data["labels"]
+
+    # Caculate weights
+
+    response = weights
+    return response
+
+
 @app.route('/update', methods=['POST'])
 def update():
     t0 = time()

Flaskserver/setup.py

 from distutils.core import setup, Extension
 import numpy.distutils.misc_util
 
-c_ext = Extension('_lsh', ['../../lsh-fast/_lsh.cpp', '../../lsh-fast/lsh.cpp'])
+c_ext = Extension('_lsh', ['../lsh-fast/_lsh.cpp', '../lsh-fast/lsh.cpp'])
 
 setup(
     name='lsh',

README.md

@@ -10,13 +10,29 @@ The application consists of two parts:
 ## Setup
 To run the application, make sure you've installed the following:
 1. Python >=3.5: https://www.python.org/downloads/
-2. Flask: https://flask.palletsprojects.com/en/1.1.x/installation/
+2. Conda: https://docs.conda.io/projects/conda/en/latest/user-guide/install/linux.html
 3. Angular: https://angular.io/guide/setup-local
 
-Once these are installed on your computer, simply run *run-angular.bat* to set up the client side GUI 
-and *run-flask.bat* to set up the server side API
+### Step 1: Creating an environment
+All dependencies are listed in the *environment.yml* file. To create an environment, run the following command:
+`conda env create -f environment.yml`
+This will create a conda environment named *pseudo*. Now activate the environment as follows:
+`conda activate pseudo`
 
-The client-side bat-file should automatically open your browser and connect to http://localhost:4200/
+### Step 2: Creating the LSH package
+The LSH algorithm is maintained locally for now, so you'll have to create it manually. The file that you need to setup this package is located in the Flaskserver folder (this is more efficient when debugging, as for every change you have to rebuild the package). So the package can be created by running the following code:
+`cd Flaskserver`
+`python3 setup.py build_ext --inplace && python3 setup.py install`
+`cd ..`
+**NOTE 1**: So as a reminder, don't forget to run the 2nd line everytime you change something in the c++ code.
+
+### Step 3: Running PSEUDo
+As mentioned before, PSEUDo exists of a gui and a server. A Makefile is provided to setup both easily. Just run the following code for the server and gui respectively:
+`make server`
+`make gui`
+A browser window should automatically be opened when running the GUI. If not, visit http://localhost:4200/
+**NOTE 1**: Both gui and server will need their own terminal window.
+**NOTE 2**: Make sure the pseudo environment is activated (step 1) when running the server, otherwise you'll get ModuleNotFound errors.
 
 # Documentation
 ## GUI

environment.yml

@@ -17,3 +17,5 @@ dependencies:
       - pybbi
       - sklearn
       - cooler
+      - ucrdtw
+      - dtw-python

lsh-fast @ 994e1549

+Subproject commit 994e1549030ad71d7164ed559b5cd1ab8733ec1a