From d426c44527b6edec047851b729acd28d83289ab8 Mon Sep 17 00:00:00 2001
From: Rhys Newell <rhys.newell@hdr.qut.edu.au>
Date: Mon, 21 Dec 2020 16:03:46 +1000
Subject: [PATCH] Name fully changed, updated version

---
 flight/__init__.py             |  2 +-
 flight/binning.py              |  1 -
 flight/cluster.py              |  1 -
 flight/{flock.py => flight.py} | 13 +++----------
 flight/metrics.py              |  1 -
 flight/utils.py                |  4 +++-
 6 files changed, 7 insertions(+), 15 deletions(-)
 rename flight/{flock.py => flight.py} (98%)

diff --git a/flight/__init__.py b/flight/__init__.py
index b3c06d4..d538f87 100644
--- a/flight/__init__.py
+++ b/flight/__init__.py
@@ -1 +1 @@
-__version__ = "0.0.1"
\ No newline at end of file
+__version__ = "1.0.0"
\ No newline at end of file
diff --git a/flight/binning.py b/flight/binning.py
index 0a66038..97ba155 100644
--- a/flight/binning.py
+++ b/flight/binning.py
@@ -23,7 +23,6 @@
 __copyright__ = "Copyright 2020"
 __credits__ = ["Rhys Newell"]
 __license__ = "GPL3"
-__version__ = "0.0.1"
 __maintainer__ = "Rhys Newell"
 __email__ = "rhys.newell near hdr.qut.edu.au"
 __status__ = "Development"
diff --git a/flight/cluster.py b/flight/cluster.py
index d3a7246..ab14faa 100644
--- a/flight/cluster.py
+++ b/flight/cluster.py
@@ -23,7 +23,6 @@
 __copyright__ = "Copyright 2020"
 __credits__ = ["Rhys Newell"]
 __license__ = "GPL3"
-__version__ = "0.0.1"
 __maintainer__ = "Rhys Newell"
 __email__ = "rhys.newell near hdr.qut.edu.au"
 __status__ = "Development"
diff --git a/flight/flock.py b/flight/flight.py
similarity index 98%
rename from flight/flock.py
rename to flight/flight.py
index 4daabc4..e244171 100644
--- a/flight/flock.py
+++ b/flight/flight.py
@@ -18,12 +18,11 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.        #
 #                                                                             #
 ###############################################################################
-
+from flock.__init__ import __version__
 __author__ = "Rhys Newell"
 __copyright__ = "Copyright 2020"
 __credits__ = ["Rhys Newell"]
 __license__ = "GPL3"
-__version__ = "0.0.1"
 __maintainer__ = "Rhys Newell"
 __email__ = "rhys.newell near hdr.qut.edu.au"
 __status__ = "Development"
@@ -234,12 +233,6 @@ def main():
                              dest="n_neighbors",
                              default=100)
 
-    bin_options.add_argument(
-        '--min_dist',
-        help=
-        'Minimum distance used by UMAP during construction of high dimensional graph',
-        dest="min_dist",
-        default=0.1)
 
     bin_options.add_argument(
         '--a_spread',
@@ -389,8 +382,8 @@ def bin(args):
                            n_components=int(args.n_components),
                            cluster_selection_method=args.cluster_selection_method,
                            threads=int(args.threads),
-                           a=float(args.a_spread),
-                           b=float(args.b_tail),
+                           a=float(args.a),
+                           b=float(args.b),
                            )
 
         clusterer.fit_transform()
diff --git a/flight/metrics.py b/flight/metrics.py
index fc7b6a0..ca3bb58 100644
--- a/flight/metrics.py
+++ b/flight/metrics.py
@@ -21,7 +21,6 @@
 __copyright__ = "Copyright 2020"
 __credits__ = ["Rhys Newell"]
 __license__ = "GPL3"
-__version__ = "0.0.1"
 __maintainer__ = "Rhys Newell"
 __email__ = "rhys.newell near hdr.qut.edu.au"
 __status__ = "Development"
diff --git a/flight/utils.py b/flight/utils.py
index fd10223..d819cc8 100644
--- a/flight/utils.py
+++ b/flight/utils.py
@@ -22,7 +22,6 @@
 __copyright__ = "Copyright 2020"
 __credits__ = ["Rhys Newell"]
 __license__ = "GPL3"
-__version__ = "0.0.1"
 __maintainer__ = "Rhys Newell"
 __email__ = "rhys.newell near hdr.qut.edu.au"
 __status__ = "Development"
@@ -32,6 +31,8 @@
 import warnings
 import logging
 import re
+import io
+from os.path import dirname, join
 
 # Function imports
 import numpy as np
@@ -45,6 +46,7 @@
 ###############################################################################                                                                                                                      [44/1010]
 ################################ - Functions - ################################
 
+
 def mp_cluster(df, n, gamma, ms, method='eom', metric='euclidean', allow_single_cluster=False):
     """
     Asynchronous parallel function for use with hyperparameter_selection function