File extension fixed. Lower case in file name fixed. Distances Fixed.

antoniocavalcante · Nov 18, 2019 · a735e07 · a735e07
1 parent 92d39f1
commit a735e07
Show file tree

Hide file tree

Showing 28 changed files with 107 additions and 20,439 deletions.
diff --git a/.gitignore b/.gitignore
@@ -150,5 +150,3 @@ venv.bak/
 .dmypy.json
 dmypy.json
 
-# .sh
-run.sh
diff --git a/Dockerfile b/Dockerfile
@@ -1,30 +1,34 @@
 FROM ubuntu:latest
 USER root
-RUN apt-get update -y
-RUN apt-get install -y apt-utils
-RUN apt-get install -y python3-dev python3-pip build-essential
-RUN apt-get install -y python-dev python-pip
 
-# Install nodemon
-RUN apt-get install -y nodejs npm
+RUN apt-get update && apt-get install -y \
+    python3-dev \
+    python3-pip \
+    build-essential \
+    python-dev \
+    python-pip \
+    nodejs \
+    npm
+
 RUN npm i -g nodemon
 
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # dependancies
-RUN apt-get install -y default-jdk
-RUN apt-get install -y python-tk
-RUN apt-get install -y python3-tk
-RUN apt install -y gunicorn
-RUN apt install -y python-numpy
+RUN apt-get update && apt-get install -y \
+    default-jdk \
+    python-tk \
+    python3-tk \
+    gunicorn \
+    python-numpy
 
 # copy source
 COPY . /app
 ENV HOME=/app
 RUN chmod a+rwx app
 WORKDIR /app
-RUN mkdir workspace
+RUN mkdir -p workspace
 RUN chmod a+rwx workspace
 
 RUN pip3 install -r requirements.txt

diff --git a/compose.sh b/compose.sh
@@ -12,6 +12,6 @@ echo "export COMPOSE_PROJECT_NAME=mustache" >> run.sh
 echo "export MUSTACHE_WORKSPACE=$1" >> run.sh
 echo "docker-compose up -d" >> run.sh
 echo "sleep 3" >> run.sh
-# echo "xdg-open http://127.0.0.01:5000" >> run.sh
+echo "xdg-open http://127.0.0.01:5000" >> run.sh
 
 docker-compose build --compress
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,7 +11,6 @@ services:
     volumes:
       - '$MUSTACHE_WORKSPACE:/app/workspace'
       - '.:/usr/src/app:ro'
-      - '.:/app'
     ports:
       - '5000:5000'
     links:
@@ -27,7 +26,6 @@ services:
       volumes:
           - '$MUSTACHE_WORKSPACE:/app/workspace'
           - '.:/usr/src/app:ro'
-          - '.:/app'
 
   redis:
       image: redis

diff --git a/mustache/__init__.py b/mustache/__init__.py
@@ -1,13 +1,7 @@
-import datetime as dt
-import uuid
-
+from flask import Flask, request, Config
 from celery import Celery
-from flask import Config, Flask, request
-
-from .util.assests import assets
-from .views.api import api
-from .views.dashboard import dashboard
-from .views.home import home
+import uuid
+import datetime as dt
 
 app = Flask(__name__)
 app.config.from_json("settings.json")
@@ -23,7 +17,12 @@ def format_datetime(value):
 celery = Celery(app.name, broker=app.config['CELERY_BROKER_URL'])
 celery.conf.update(app.config)
 
+from .views.dashboard import dashboard
+from .views.home import home
+from .views.api import api
 
 app.register_blueprint(home, url_prefix="/")
 app.register_blueprint(dashboard, url_prefix="/dashboard")
 app.register_blueprint(api)
+
+from .util.assests import assets
diff --git a/mustache/resources/IHDBSCAN.jar b/mustache/resources/IHDBSCAN.jar
diff --git a/mustache/resources/hierarchies.py b/mustache/resources/hierarchies.py
@@ -25,7 +25,7 @@
 
 import os
 
-# import pyximport; pyximport.install()
+import pyximport; pyximport.install()
 
 import hierarchy
 from hierarchy_tree import HierarchyTree

diff --git a/mustache/resources/run.sh b/mustache/resources/run.sh
@@ -30,6 +30,7 @@ FILE_NAME=$(basename "$1")
 java -jar -Xmx12G IHDBSCAN.jar file=$8/$FILE_NAME minPts=$2 minClSize=$3 filter=$4 output=$5 dist_function=$6 compact=$7 separator=","
 
 mv $8/visualization/*.mst $8/msts
+rm $8/visualization/*.tree
 
 # Runs the meta-clustering.
 python hierarchies.py "$8/visualization" $FILE_NAME 2 $MPTS

diff --git a/mustache/settings.json b/mustache/settings.json
@@ -1,6 +1,6 @@
 {
     "WORKSPACE": "/app/workspace",
-    "DEBUG": true,
+    "DEBUG": false,
     "CELERY_BROKER_URL": "redis://redis/0",
     "CELERY_RESULT_BACKEND": "redis://redis/0"
 }
diff --git a/mustache/static/css/dashboard/dashboard.css b/mustache/static/css/dashboard/dashboard.css
@@ -139,10 +139,6 @@ div.tooltip {
     display: inline;
 }
 
-#chart-circle {
-    display: inline;
-}
-
 body {
     overflow: hidden;
 }
@@ -235,7 +231,7 @@ html {
 }
 
 .grouper>.row {
-    overflow-y: scroll;
+    overflow-x: scroll;
     white-space: nowrap;
 }
 
@@ -566,34 +562,3 @@ html {
 .about-header {
     font-size: 24px;
 }
-
-.d3-tip {
-    line-height: 1;
-    font: 14px sans-serif;
-    padding: 12px;
-    background: rgba(0, 0, 0, 0.8);
-    color: rgb(185, 185, 185);
-    border-radius: 2px;
-    box-shadow: 0 0 11px 0px black;
-    z-index: 10000;
-}
-
-  /* Creates a small triangle extender for the tooltip */
-  .d3-tip:after {
-    box-sizing: border-box;
-    display: inline;
-    font-size: 10px;
-    width: 100%;
-    line-height: 1;
-    color: rgba(0, 0, 0, 0.8);
-    content: "\25BC";
-    position: absolute;
-    text-align: center;
-  }
-
-.d3-tip.n:after {
-    margin: -1px 0 0 0;
-    top: 100%;
-    left: 0;
-    z-index: -1;
-  }
diff --git a/mustache/static/gen/dashboard.css b/mustache/static/gen/dashboard.css
@@ -8131,10 +8131,6 @@ div.tooltip {
     display: inline;
 }
 
-#chart-circle {
-    display: inline;
-}
-
 body {
     overflow: hidden;
 }
@@ -8216,7 +8212,7 @@ html {
 }
 
 .side-logo-newcastle {
-    width: 80%;
+    width: 90%;
     margin: 0 5%;
     margin-bottom: 10%;
 }
@@ -8227,7 +8223,7 @@ html {
 }
 
 .grouper>.row {
-    overflow-y: scroll;
+    overflow-x: scroll;
     white-space: nowrap;
 }
 
@@ -8558,37 +8554,6 @@ html {
 .about-header {
     font-size: 24px;
 }
-
-.d3-tip {
-    line-height: 1;
-    font: 14px sans-serif;
-    padding: 12px;
-    background: rgba(0, 0, 0, 0.8);
-    color: rgb(185, 185, 185);
-    border-radius: 2px;
-    box-shadow: 0 0 11px 0px black;
-    z-index: 10000;
-}
-
-  /* Creates a small triangle extender for the tooltip */
-  .d3-tip:after {
-    box-sizing: border-box;
-    display: inline;
-    font-size: 10px;
-    width: 100%;
-    line-height: 1;
-    color: rgba(0, 0, 0, 0.8);
-    content: "\25BC";
-    position: absolute;
-    text-align: center;
-  }
-
-.d3-tip.n:after {
-    margin: -1px 0 0 0;
-    top: 100%;
-    left: 0;
-    z-index: -1;
-  }
 #wrapper .sidebar {
   background-color: #2B333E;
 }

diff --git a/mustache/static/gen/dashboard.js b/mustache/static/gen/dashboard.js
diff --git a/mustache/static/gen/home.css b/mustache/static/gen/home.css
@@ -15342,7 +15342,6 @@ body {
     width: 100%;
     height: 2px;
 } */
-
 .lds-rng {
     display: inline-block;
     position: relative;
@@ -15659,10 +15658,6 @@ div.tooltip {
     display: inline;
 }
 
-#chart-circle {
-    display: inline;
-}
-
 body {
     overflow: hidden;
 }
@@ -15744,7 +15739,7 @@ html {
 }
 
 .side-logo-newcastle {
-    width: 80%;
+    width: 90%;
     margin: 0 5%;
     margin-bottom: 10%;
 }
@@ -15755,7 +15750,7 @@ html {
 }
 
 .grouper>.row {
-    overflow-y: scroll;
+    overflow-x: scroll;
     white-space: nowrap;
 }
 
@@ -16086,37 +16081,6 @@ html {
 .about-header {
     font-size: 24px;
 }
-
-.d3-tip {
-    line-height: 1;
-    font: 14px sans-serif;
-    padding: 12px;
-    background: rgba(0, 0, 0, 0.8);
-    color: rgb(185, 185, 185);
-    border-radius: 2px;
-    box-shadow: 0 0 11px 0px black;
-    z-index: 10000;
-}
-
-  /* Creates a small triangle extender for the tooltip */
-  .d3-tip:after {
-    box-sizing: border-box;
-    display: inline;
-    font-size: 10px;
-    width: 100%;
-    line-height: 1;
-    color: rgba(0, 0, 0, 0.8);
-    content: "\25BC";
-    position: absolute;
-    text-align: center;
-  }
-
-.d3-tip.n:after {
-    margin: -1px 0 0 0;
-    top: 100%;
-    left: 0;
-    z-index: -1;
-  }
 @font-face {
     font-family: LogoFont;
     src: url(../css/roboto-condensed/RobotoCondensed-Bold.ttf);