Skip to content

Commit

Permalink
Fixing availabale distances.
Browse files Browse the repository at this point in the history
  • Loading branch information
antoniocavalcante committed Nov 18, 2019
1 parent 8662ed1 commit d6711ce
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 655 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:latest
USER root
RUN apt-get update -y
#RUN apt-get install -y apt-utils
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

Expand Down
17 changes: 9 additions & 8 deletions mustache/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
from flask import Flask, request, Config
from celery import Celery
import uuid
import datetime as dt
import uuid

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

app = Flask(__name__)
app.config.from_json("settings.json")
Expand All @@ -17,12 +23,7 @@ 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
1 change: 0 additions & 1 deletion mustache/resources/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ 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
Expand Down
2 changes: 1 addition & 1 deletion mustache/tasks/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def process(self, workspace, root, files, settings):
json.dump(settings, fp)

root = str(os.path.dirname(root))
venv = str(os.path.join(root, 'resources/run.sh'))

sh = str(os.path.join(root, 'resources/run.sh'))
in_file = str(os.path.join(path, files[0]['name']))

Expand Down
Loading

0 comments on commit d6711ce

Please sign in to comment.