diff --git a/analysis-master/analysis.egg-info/PKG-INFO b/analysis-master/analysis.egg-info/PKG-INFO index a4f2adcc..fa3f4806 100644 --- a/analysis-master/analysis.egg-info/PKG-INFO +++ b/analysis-master/analysis.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: analysis -Version: 1.0.0.2 +Version: 1.0.0.3 Summary: analysis package developed by Titan Scouting for The Red Alliance Home-page: https://github.com/titanscout2022/tr2022-strategy Author: The Titan Scouting Team diff --git a/analysis-master/analysis/analysis.py b/analysis-master/analysis/analysis.py index 1d00e13b..36e17a08 100644 --- a/analysis-master/analysis/analysis.py +++ b/analysis-master/analysis/analysis.py @@ -7,10 +7,12 @@ # current benchmark of optimization: 1.33 times faster # setup: -__version__ = "1.1.12.005" +__version__ = "1.1.12.006" # changelog should be viewed using print(analysis.__changelog__) __changelog__ = """changelog: + 1.1.12.006: + - fixed bg with a division by zero in histo_analysis 1.1.12.005: - fixed numba issues by removing numba from elo, glicko2 and trueskill 1.1.12.004: @@ -323,13 +325,19 @@ def z_normalize(array, *args): # expects 2d array of [x,y] def histo_analysis(hist_data): - hist_data = np.array(hist_data) - derivative = np.array(len(hist_data) - 1, dtype = float) - t = np.diff(hist_data) - derivative = t[1] / t[0] - np.sort(derivative) + if(len(hist_data[0]) > 2): - return basic_stats(derivative)[0], basic_stats(derivative)[3] + hist_data = np.array(hist_data) + derivative = np.array(len(hist_data) - 1, dtype = float) + t = np.diff(hist_data) + derivative = t[1] / t[0] + np.sort(derivative) + + return basic_stats(derivative)[0], basic_stats(derivative)[3] + + else: + + return None def regression(ndevice, inputs, outputs, args, loss = torch.nn.MSELoss(), _iterations = 10000, lr = 0.01, _iterations_ply = 10000, lr_ply = 0.01): # inputs, outputs expects N-D array diff --git a/analysis-master/build/lib/analysis/analysis.py b/analysis-master/build/lib/analysis/analysis.py index 1d00e13b..36e17a08 100644 --- a/analysis-master/build/lib/analysis/analysis.py +++ b/analysis-master/build/lib/analysis/analysis.py @@ -7,10 +7,12 @@ # current benchmark of optimization: 1.33 times faster # setup: -__version__ = "1.1.12.005" +__version__ = "1.1.12.006" # changelog should be viewed using print(analysis.__changelog__) __changelog__ = """changelog: + 1.1.12.006: + - fixed bg with a division by zero in histo_analysis 1.1.12.005: - fixed numba issues by removing numba from elo, glicko2 and trueskill 1.1.12.004: @@ -323,13 +325,19 @@ def z_normalize(array, *args): # expects 2d array of [x,y] def histo_analysis(hist_data): - hist_data = np.array(hist_data) - derivative = np.array(len(hist_data) - 1, dtype = float) - t = np.diff(hist_data) - derivative = t[1] / t[0] - np.sort(derivative) + if(len(hist_data[0]) > 2): - return basic_stats(derivative)[0], basic_stats(derivative)[3] + hist_data = np.array(hist_data) + derivative = np.array(len(hist_data) - 1, dtype = float) + t = np.diff(hist_data) + derivative = t[1] / t[0] + np.sort(derivative) + + return basic_stats(derivative)[0], basic_stats(derivative)[3] + + else: + + return None def regression(ndevice, inputs, outputs, args, loss = torch.nn.MSELoss(), _iterations = 10000, lr = 0.01, _iterations_ply = 10000, lr_ply = 0.01): # inputs, outputs expects N-D array diff --git a/analysis-master/dist/analysis-1.0.0.3-py3-none-any.whl b/analysis-master/dist/analysis-1.0.0.3-py3-none-any.whl new file mode 100644 index 00000000..13eca2cc Binary files /dev/null and b/analysis-master/dist/analysis-1.0.0.3-py3-none-any.whl differ diff --git a/analysis-master/dist/analysis-1.0.0.3.tar.gz b/analysis-master/dist/analysis-1.0.0.3.tar.gz new file mode 100644 index 00000000..939ada77 Binary files /dev/null and b/analysis-master/dist/analysis-1.0.0.3.tar.gz differ diff --git a/analysis-master/setup.py b/analysis-master/setup.py index cc268ba3..7125084f 100644 --- a/analysis-master/setup.py +++ b/analysis-master/setup.py @@ -2,7 +2,7 @@ import setuptools setuptools.setup( name="analysis", # Replace with your own username - version="1.0.0.002", + version="1.0.0.003", author="The Titan Scouting Team", author_email="titanscout2022@gmail.com", description="analysis package developed by Titan Scouting for The Red Alliance",