diff --git a/analysis-master/setup.py b/analysis-master/setup.py index 043ca845..ef3738b9 100644 --- a/analysis-master/setup.py +++ b/analysis-master/setup.py @@ -7,8 +7,8 @@ with open("requirements.txt", 'r') as file: requirements.append(line) setuptools.setup( - name="analysis", - version="1.0.0.012", + name="tra_analysis", + version="2.0.0", author="The Titan Scouting Team", author_email="titanscout2022@gmail.com", description="analysis package developed by Titan Scouting for The Red Alliance", diff --git a/analysis-master/test_analysis.py b/analysis-master/test_analysis.py index 0d1ce96b..ffb7e88f 100644 --- a/analysis-master/test_analysis.py +++ b/analysis-master/test_analysis.py @@ -1,5 +1,5 @@ -from analysis import analysis as an -from analysis import metrics +from tra_analysis import analysis as an +from tra_analysis import metrics def test_(): test_data_linear = [1, 3, 6, 7, 9] diff --git a/analysis-master/analysis/.ipynb_checkpoints/equation-checkpoint.ipynb b/analysis-master/tra_analysis/.ipynb_checkpoints/equation-checkpoint.ipynb similarity index 100% rename from analysis-master/analysis/.ipynb_checkpoints/equation-checkpoint.ipynb rename to analysis-master/tra_analysis/.ipynb_checkpoints/equation-checkpoint.ipynb diff --git a/analysis-master/analysis/__init__.py b/analysis-master/tra_analysis/__init__.py similarity index 100% rename from analysis-master/analysis/__init__.py rename to analysis-master/tra_analysis/__init__.py diff --git a/analysis-master/tra_analysis/__pycache__/__init__.cpython-38.pyc b/analysis-master/tra_analysis/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..f690e868 Binary files /dev/null and b/analysis-master/tra_analysis/__pycache__/__init__.cpython-38.pyc differ diff --git a/analysis-master/tra_analysis/__pycache__/analysis.cpython-38.pyc b/analysis-master/tra_analysis/__pycache__/analysis.cpython-38.pyc new file mode 100644 index 00000000..1c0a646b Binary files /dev/null and b/analysis-master/tra_analysis/__pycache__/analysis.cpython-38.pyc differ diff --git a/analysis-master/analysis/analysis.py b/analysis-master/tra_analysis/analysis.py similarity index 99% rename from analysis-master/analysis/analysis.py rename to analysis-master/tra_analysis/analysis.py index 07e619c4..3af6f338 100644 --- a/analysis-master/analysis/analysis.py +++ b/analysis-master/tra_analysis/analysis.py @@ -1,7 +1,7 @@ # Titan Robotics Team 2022: Data Analysis Module # Written by Arthur Lu & Jacob Levine # Notes: -# this should be imported as a python module using 'from analysis import analysis' +# this should be imported as a python module using 'from tra_analysis import analysis' # this should be included in the local directory or environment variable # this module has been optimized for multhreaded computing # current benchmark of optimization: 1.33 times faster @@ -345,8 +345,8 @@ __all__ = [ # imports (now in alphabetical order! v 1.0.3.006): import csv -from analysis.metrics import elo as Elo -from analysis.metrics import glicko2 as Glicko2 +from tra_analysis.metrics import elo as Elo +from tra_analysis.metrics import glicko2 as Glicko2 import math import numba from numba import jit @@ -355,7 +355,7 @@ import scipy from scipy import optimize, stats import sklearn from sklearn import preprocessing, pipeline, linear_model, metrics, cluster, decomposition, tree, neighbors, naive_bayes, svm, model_selection, ensemble -from analysis.metrics import trueskill as Trueskill +from tra_analysis.metrics import trueskill as Trueskill import warnings class error(ValueError): diff --git a/analysis-master/analysis/equation.ipynb b/analysis-master/tra_analysis/equation.ipynb similarity index 100% rename from analysis-master/analysis/equation.ipynb rename to analysis-master/tra_analysis/equation.ipynb diff --git a/analysis-master/analysis/metrics/__init__.py b/analysis-master/tra_analysis/metrics/__init__.py similarity index 100% rename from analysis-master/analysis/metrics/__init__.py rename to analysis-master/tra_analysis/metrics/__init__.py diff --git a/analysis-master/tra_analysis/metrics/__pycache__/__init__.cpython-38.pyc b/analysis-master/tra_analysis/metrics/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..34a0ffb3 Binary files /dev/null and b/analysis-master/tra_analysis/metrics/__pycache__/__init__.cpython-38.pyc differ diff --git a/analysis-master/tra_analysis/metrics/__pycache__/elo.cpython-38.pyc b/analysis-master/tra_analysis/metrics/__pycache__/elo.cpython-38.pyc new file mode 100644 index 00000000..8f9f95ae Binary files /dev/null and b/analysis-master/tra_analysis/metrics/__pycache__/elo.cpython-38.pyc differ diff --git a/analysis-master/tra_analysis/metrics/__pycache__/glicko2.cpython-38.pyc b/analysis-master/tra_analysis/metrics/__pycache__/glicko2.cpython-38.pyc new file mode 100644 index 00000000..fd478f0e Binary files /dev/null and b/analysis-master/tra_analysis/metrics/__pycache__/glicko2.cpython-38.pyc differ diff --git a/analysis-master/tra_analysis/metrics/__pycache__/trueskill.cpython-38.pyc b/analysis-master/tra_analysis/metrics/__pycache__/trueskill.cpython-38.pyc new file mode 100644 index 00000000..8dfb9d29 Binary files /dev/null and b/analysis-master/tra_analysis/metrics/__pycache__/trueskill.cpython-38.pyc differ diff --git a/analysis-master/analysis/metrics/elo.py b/analysis-master/tra_analysis/metrics/elo.py similarity index 100% rename from analysis-master/analysis/metrics/elo.py rename to analysis-master/tra_analysis/metrics/elo.py diff --git a/analysis-master/analysis/metrics/glicko2.py b/analysis-master/tra_analysis/metrics/glicko2.py similarity index 100% rename from analysis-master/analysis/metrics/glicko2.py rename to analysis-master/tra_analysis/metrics/glicko2.py diff --git a/analysis-master/analysis/metrics/trueskill.py b/analysis-master/tra_analysis/metrics/trueskill.py similarity index 100% rename from analysis-master/analysis/metrics/trueskill.py rename to analysis-master/tra_analysis/metrics/trueskill.py diff --git a/analysis-master/analysis/regression.py b/analysis-master/tra_analysis/regression.py similarity index 100% rename from analysis-master/analysis/regression.py rename to analysis-master/tra_analysis/regression.py diff --git a/analysis-master/analysis/titanlearn.py b/analysis-master/tra_analysis/titanlearn.py similarity index 100% rename from analysis-master/analysis/titanlearn.py rename to analysis-master/tra_analysis/titanlearn.py diff --git a/analysis-master/analysis/visualization.py b/analysis-master/tra_analysis/visualization.py similarity index 100% rename from analysis-master/analysis/visualization.py rename to analysis-master/tra_analysis/visualization.py diff --git a/data-analysis/superscript.py b/data-analysis/superscript.py index 94e2d84a..89b21447 100644 --- a/data-analysis/superscript.py +++ b/data-analysis/superscript.py @@ -110,7 +110,7 @@ __all__ = [ # imports: -from analysis import analysis as an +from tra_analysis import analysis as an import data as d import json import numpy as np