mapdata 3.21.0__tar.gz → 3.22.0__tar.gz

{mapdata-3.21.0/mapdata.egg-info → mapdata-3.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapdata
-Version: 3.21.0
+Version: 3.22.0
 Summary: An interactive map and table explorer for geographic coordinates in a spreadsheet, CSV file, or database that includes data plotting and statistical summaries
 Home-page: https:/hg.sr.ht/~rdnielsen/mapdata
 Author: Dreas Nielsen

{mapdata-3.21.0 → mapdata-3.22.0}/mapdata/mapdata.py

@@ -24,8 +24,8 @@
 #
 # ==================================================================
 
-version = "3.21.0"
-vdate = "2026-03-17"
+version = "3.22.0"
+vdate = "2026-03-31"
 
 copyright = "2023-2026"
 
@@ -99,6 +99,7 @@ try:
 	mk_available = True
 except:
 	mk_available = False
+import kneeliverse
 
 
 # Default name of configuration file.  Files with other names may be read.
@@ -2361,6 +2362,41 @@ def list_mse(y):
     # This computes the MSE for differences between elements of the list and 1.0
     return sum([(s-1)**2 for s in y])/len(y)
 
+def elbow_kneeliverse(rmses):
+	# Returns the x value of the elbow
+	pts = np.array(list(zip(list(range(1, len(rmses)+1)), rmses)))
+	return kneeliverse.kneedle.knee(pts)
+
+class LinePoints(object):
+	# For calculation of elbow inflection using `kneedle` algorithm:
+	# maximum distance of point from line.
+	def __init__(self, x1, y1, x2, y2):
+		self.yd = y2 - y1
+		self.xd = x2 - x1
+		self.xyterm = x2 * y1 - y2 * x1
+		self.denom = math.sqrt(self.yd**2 + self.xd**2)
+	def point_dist(self, xx, yy):
+		return abs(self.yd * xx - self.xd * yy + self.xyterm) / self.denom
+	def signed_point_dist(self, xx, yy):
+		# Positive values are below the line, negative values above.
+		return (self.yd * xx - self.xd * yy + self.xyterm) / self.denom
+
+def kneedle_maxdist(rmses):
+	xs = list(range(1, len(rmses)+1))
+	lp = LinePoints(xs[0], rmses[0], xs[-1], rmses[-1])
+	dists = [lp.signed_point_dist(xs[i], rmses[i]) for i in range(1,len(rmses)-1)]
+	return dists.index(max(dists)) + 2
+
+def elbow(rmses, eucdists):
+	# Returns the elbow in the list of RMSE or Euclidean distance values.
+	if len(rmses) < 3:
+		return len(rmses)
+	kd_rmse_em = max(kneedle_maxdist(rmses), kneedle_maxdist(eucdists))
+	if kd_rmse_em < 5:
+		return kd_rmse_em
+	return elbow_kneeliverse(rmses)
+
+
 def iterate_nmf(D, n_em, max_iterations=200, mse_goal=0.00001):
 	# Performs NMF on D until the row sums of the W matrix are all (approximately) 1.0.
     nmf_model1 = NMF(n_components=n_em, solver='mu', max_iter=500)
@@ -13696,7 +13732,7 @@ class NMFUnmixingDialog(Dialog):
 		var_frame = tk.Frame(frame_panes, width=250, borderwidth=2, relief=tk.RIDGE)
 		var_frame.grid(row=0, column=0, sticky=tk.NSEW)
 		var_frame.rowconfigure(0, weight=1)
-		var_frame.columnconfigure(0, weight=1, minsize=200)
+		var_frame.columnconfigure(0, weight=1)
 		frame_panes.add(var_frame, weight=1)
 
 		# Maybe add a dropdown to select the row ID variable if there are multiple.
@@ -13900,21 +13936,12 @@ class NMFUnmixingDialog(Dialog):
 					# Diagnostics: Total residual, RSS, AIC, RMSE, Frobenius norm of matrix difference, K-L divergence
 					diagnostics.append([em_no, fp_display(arraysum(fit_ds)-arraysum(ds), 4), fp_display(fit_rss,5),
 						fp_display(fit_aic,4), fp_display(fit_rmse,4), fp_display(frobnorm,4), fp_display(kl_div,3)])
-				if len(rmses) > 1:
-					rmse_diffs = [rmses[i] - rmses[i+1] for i in range(len(rmses)-1)]
-					sel_em = rmse_diffs.index(max(rmse_diffs))+2
-					if len(rmse_diffs) > 2:
-						rmse_diffs2 = [rmse_diffs[i] - rmse_diffs[i+1] for i in range(len(rmse_diffs)-1)]
-						sel_em2 = rmse_diffs2.index(max(rmse_diffs2))+2
-						if sel_em != max_ems-1:
-							sel_em = sel_em2
-					else:
-						sel_em = rmse_diffs.index(max(rmse_diffs))+2
-					self.em_var.set(sel_em)
-					sel_em_index = sel_em - 1
+				if len(rmses) > 2:
+					sel_em_index = elbow(rmses, frobs) - 1
 				else:
-					self.em_var.set(1)
-					sel_em_index = 0
+					sel_em_index = length(test_ems) - 1
+				sel_em = test_ems[sel_em_index]
+				self.em_var.set(sel_em)
 				self.em_sel["values"] = test_ems
 				self.em_sel["state"] = tk.NORMAL
 				W, H = unmixes[sel_em_index]

{mapdata-3.21.0 → mapdata-3.22.0/mapdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapdata
-Version: 3.21.0
+Version: 3.22.0
 Summary: An interactive map and table explorer for geographic coordinates in a spreadsheet, CSV file, or database that includes data plotting and statistical summaries
 Home-page: https:/hg.sr.ht/~rdnielsen/mapdata
 Author: Dreas Nielsen

{mapdata-3.21.0 → mapdata-3.22.0}/mapdata.egg-info/requires.txt

@@ -1,4 +1,5 @@
 jenkspy
+kneeliverse
 loess
 matplotlib
 odfpy

{mapdata-3.21.0 → mapdata-3.22.0}/setup.py

@@ -9,7 +9,7 @@ symbol_files = glob.glob("mapdata/symbols/16x16/*.xbm") + glob.glob("mapdata/sym
 			glob.glob("mapdata/symbols/24x24/*.xbm") + glob.glob("mapdata/symbols/28x28/*.xbm")
 
 setuptools.setup(name='mapdata',
-	version='3.21.0',
+	version='3.22.0',
 	description="An interactive map and table explorer for geographic coordinates in a spreadsheet, CSV file, or database that includes data plotting and statistical summaries",
 	author='Dreas Nielsen',
 	author_email='cortice@tutanota.com',
@@ -18,7 +18,7 @@ setuptools.setup(name='mapdata',
 	scripts=['mapdata/mapdata.py'],
 	data_files=[('symbols', symbol_files), ('config', ['mapdata/configfile/mapdata.conf'])],
     license='GPL',
-	install_requires=['tkintermapview', 'pyproj', 'jenkspy', 'odfpy', 'openpyxl', 'xlrd', 'matplotlib', 'seaborn', 'loess', 'statsmodels', 'scipy', 'scikit-learn', 'pymannkendall', 'umap-learn', 'pynndescent'],
+	install_requires=['tkintermapview', 'pyproj', 'jenkspy', 'odfpy', 'openpyxl', 'xlrd', 'matplotlib', 'seaborn', 'loess', 'statsmodels', 'scipy', 'scikit-learn', 'pymannkendall', 'umap-learn', 'pynndescent', 'kneeliverse'],
 	python_requires = '>=3.8',
 	classifiers=[
 		'Development Status :: 5 - Production/Stable',