mapdata 3.6.1__tar.gz → 3.6.4__tar.gz

{mapdata-3.6.1/mapdata.egg-info → mapdata-3.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapdata
-Version: 3.6.1
+Version: 3.6.4
 Summary: An interactive map and table explorer for geographic coordinates in a spreadsheet, CSV file, or database
 Home-page: https://osdn.net/project/mapdata/
 Author: Dreas Nielsen
@@ -134,6 +134,8 @@ A configuration file template and additional bitmap symbols are included with th
  
   * [pymannkendall](https://pypi.org/project/pymannkendall/)
 
+  * [pynndescent](https://pypi.org/project/pynndescent/)
+ 
   * [pyproj](https://pypi.org/project/pyproj/)
  
   * [scikit-learn](https://pypi.org/project/scikit-learn/)
@@ -146,6 +148,8 @@ A configuration file template and additional bitmap symbols are included with th
 
   * [tkintermapview](https://pypi.org/project/tkintermapview/)
 
+  * [umap-learn](https://pypi.org/project/umap-learn/)
+
   * [xlrd](https://pypi.org/project/xlrd/)
 
 If *mapdata.py* is used to query a database to obtain a data set to view and

{mapdata-3.6.1 → mapdata-3.6.4}/README.md

@@ -92,6 +92,8 @@ A configuration file template and additional bitmap symbols are included with th
  
   * [pymannkendall](https://pypi.org/project/pymannkendall/)
 
+  * [pynndescent](https://pypi.org/project/pynndescent/)
+ 
   * [pyproj](https://pypi.org/project/pyproj/)
  
   * [scikit-learn](https://pypi.org/project/scikit-learn/)
@@ -104,6 +106,8 @@ A configuration file template and additional bitmap symbols are included with th
 
   * [tkintermapview](https://pypi.org/project/tkintermapview/)
 
+  * [umap-learn](https://pypi.org/project/umap-learn/)
+
   * [xlrd](https://pypi.org/project/xlrd/)
 
 If *mapdata.py* is used to query a database to obtain a data set to view and

{mapdata-3.6.1 → mapdata-3.6.4}/mapdata/mapdata.py

@@ -24,8 +24,8 @@
 #
 # ==================================================================
 
-version = "3.6.1"
-vdate = "2024-04-23"
+version = "3.6.4"
+vdate = "2024-05-17"
 
 copyright = "2023-2024"
 
@@ -2170,7 +2170,7 @@ class MapUI(object):
 		self.set_tbl_selectmode()
 		self.set_status()
 		# Add menu
-		self.add_menu(table_object = self.tbl, column_headers=headers)
+		self.add_menu(table_object = self.tbl)
 		self.map_widget.canvas.bind("<Control-ButtonRelease-1>", self.delete_selected)
 		self.tbl.bind('<ButtonRelease-1>', self.mark_map)
 		# Other key bindings
@@ -3290,7 +3290,7 @@ class MapUI(object):
 			self.mark_map(None)
 			self.set_status()
 
-	def add_menu(self, table_object, column_headers):
+	def add_menu(self, table_object):
 		mnu = tk.Menu(self.win)
 		self.win.config(menu=mnu)
 		file_menu = tk.Menu(mnu, tearoff=0)
@@ -3312,7 +3312,7 @@ class MapUI(object):
 				rowset = []
 				for sel_row in table_object.selection():
 					rowset.append(table_object.item(sel_row)["values"])
-				export_data_table(column_headers, rowset, sheetname="Selected map items")
+				export_data_table(self.headers, rowset, sheetname="Selected map items")
 		def save_map():
 			outfile = tkfiledialog.asksaveasfilename(title="File to save map",
 				filetypes=[('Postscript files', '.ps'), ('JPEG files', '.jpg'), ('PNG files', '.png')],
@@ -8552,6 +8552,8 @@ class UMAPDialog(object):
 			self.data_labels = None
 			self.data_btn["state"] = tk.DISABLED
 			self.calc_btn["state"] = tk.DISABLED
+			self.loading_dlg.hide()
+			warning("The dataset must have at least 6 rows for UMAP analysis", {'parent':self.dlg})
 		else:
 			# UMAP can operate on sparse arrays, so there's no need to remove missing data
 			clean_data = dataset
@@ -8582,90 +8584,91 @@ class UMAPDialog(object):
 		from sklearn.preprocessing import StandardScaler
 		self.clear_output()
 		self.get_data()
-		# Check to see if this is a sparse matrix
-		is_sparse = False
-		for col in range(self.n_dataset_columns):
-			if any([x is None or x == 0.0 for x in self.dataset[col]]):
-				is_sparse = True
-				break
-		ds = copy.copy(self.dataset[0:self.n_dataset_columns])
-		if is_sparse:
-			# Replace all None with 0
-			for col in range(len(ds)):
-				ds[col] = [0.0 if x is None else x for x in ds[col]]
-		dsa = np.array(columns_to_rows(ds), dtype=float)
-		if is_sparse:
-			# Convert to a LIL array
-			dsm = sparse.lil_matrix(dsa)
-			# Normalize the variables
-			inp_data = StandardScaler(with_mean=False).fit_transform(dsm)
-		else:
-			# Normalize the variables
-			inp_data = StandardScaler().fit_transform(dsa)
-		reducer = umap.UMAP(n_neighbors=min(self.neighbors_var.get(), len(self.dataset[0])-1), min_dist=self.mindist_var.get(), n_components=2,
-				metric=self.metric_var.get())
-		umap_result = reducer.fit_transform(inp_data)
-		self.umap_coords = [umap_result[:,0], umap_result[:,1]]
-		self.umap_labels = ["Dimension 1", "Dimension 2"]
-		self.dtable_btn["state"] = tk.NORMAL
-		# Single or grouped scatter plot
-		if self.groupby_col is None:
-			splot = self.plot_axes.scatter(self.umap_coords[0], self.umap_coords[1], alpha=self.alpha)
-			self.plot_handle_list = []
-			self.plot_label_list = []
-		else:
-			groups = sorted([str(x) for x in list(set(self.dataset[self.groupby_col-1]))])
-			cmap = map_colors(groups)
-			colors = [cmap[str(g)] for g in self.dataset[self.groupby_col-1]]
-			splot = self.plot_axes.scatter(self.umap_coords[0], self.umap_coords[1], c=colors, alpha=self.alpha)
-			# Custom legend handle for grouped scatter plot
-			lbls = list(cmap.keys())
-			if wrap_at_underscores:
-				lbls = [l.replace("_", " ") for l in lbls]
-			lbls = ["\n".join(textwrap.wrap(l, width=wrapwidth)) for l in lbls]
-			colkey = list(cmap.values())
-			symbs = [matplotlib.lines.Line2D([], [], marker='o', color=colkey[i], label=lbls[i], linestyle='None') for i in range(len(lbls))]
-			self.plot_handle_list = symbs
-			self.plot_label_list = lbls
-		# Hover annotation
-		def update_annot(ind):
-			pos = splot.get_offsets()[ind["ind"][0]]
-			self.annot.xy = pos
-			text = ", ".join([str(self.dataset[self.label_col-1][n]) for n in ind["ind"]])
-			self.annot.set_text(text)
-			self.annot.get_bbox_patch().set_facecolor("wheat")
-			self.annot.get_bbox_patch().set_alpha(0.8)
-		def hover(event):
-			vis = self.annot.get_visible()
-			if event.inaxes == self.plot_axes:
-				cont, ind = splot.contains(event)
-				if cont:
-					update_annot(ind)
-					self.annot.set_visible(True)
-				else:
-					if vis:
-						self.annot.set_visible(False)
-				self.plotfig_canvas.draw_idle()
-		if self.label_col is not None:
-			self.annot = self.plot_axes.annotate("", xy=(0,0), xytext=(8,12), textcoords="offset points", \
-					bbox={"boxstyle": "round", "fc": "w"}, arrowprops={"arrowstyle": "->"})
-			self.annot.set_visible(False)
-			self.canvas_conn_id = self.plotfig_canvas.mpl_connect("motion_notify_event", hover)
-		else:
-			if self.canvas_conn_id is not None:
-				self.plotfig_canvas.mpl_disconnect(self.canvas_conn_id)
-		# Legend
-		if len(self.plot_handle_list) > 0:
-			self.plot_axes.legend(handles=self.plot_handle_list, labels=self.plot_label_list)
-
-		self.plot_axes.set_xlabel(self.umap_labels[0])
-		self.plot_axes.set_ylabel(self.umap_labels[1])
-		self.plotfig_canvas.draw()
-		self.plot_nav.update()
-		self.dlg.bind("<Alt-a>", self.set_alpha)
-		self.cluster_btn["state"] = tk.NORMAL
-		self.clust_save_btn["state"] = tk.DISABLED
-		self.loading_dlg.hide()
+		if self.dataset is not None:
+			# Check to see if this is a sparse matrix
+			is_sparse = False
+			for col in range(self.n_dataset_columns):
+				if any([x is None or x == 0.0 for x in self.dataset[col]]):
+					is_sparse = True
+					break
+			ds = copy.copy(self.dataset[0:self.n_dataset_columns])
+			if is_sparse:
+				# Replace all None with 0
+				for col in range(len(ds)):
+					ds[col] = [0.0 if x is None else x for x in ds[col]]
+			dsa = np.array(columns_to_rows(ds), dtype=float)
+			if is_sparse:
+				# Convert to a LIL array
+				dsm = sparse.lil_matrix(dsa)
+				# Normalize the variables
+				inp_data = StandardScaler(with_mean=False).fit_transform(dsm)
+			else:
+				# Normalize the variables
+				inp_data = StandardScaler().fit_transform(dsa)
+			reducer = umap.UMAP(n_neighbors=min(self.neighbors_var.get(), len(self.dataset[0])-1), min_dist=self.mindist_var.get(), n_components=2,
+					metric=self.metric_var.get())
+			umap_result = reducer.fit_transform(inp_data)
+			self.umap_coords = [umap_result[:,0], umap_result[:,1]]
+			self.umap_labels = ["Dimension 1", "Dimension 2"]
+			self.dtable_btn["state"] = tk.NORMAL
+			# Single or grouped scatter plot
+			if self.groupby_col is None:
+				splot = self.plot_axes.scatter(self.umap_coords[0], self.umap_coords[1], alpha=self.alpha)
+				self.plot_handle_list = []
+				self.plot_label_list = []
+			else:
+				groups = sorted([str(x) for x in list(set(self.dataset[self.groupby_col-1]))])
+				cmap = map_colors(groups)
+				colors = [cmap[str(g)] for g in self.dataset[self.groupby_col-1]]
+				splot = self.plot_axes.scatter(self.umap_coords[0], self.umap_coords[1], c=colors, alpha=self.alpha)
+				# Custom legend handle for grouped scatter plot
+				lbls = list(cmap.keys())
+				if wrap_at_underscores:
+					lbls = [l.replace("_", " ") for l in lbls]
+				lbls = ["\n".join(textwrap.wrap(l, width=wrapwidth)) for l in lbls]
+				colkey = list(cmap.values())
+				symbs = [matplotlib.lines.Line2D([], [], marker='o', color=colkey[i], label=lbls[i], linestyle='None') for i in range(len(lbls))]
+				self.plot_handle_list = symbs
+				self.plot_label_list = lbls
+			# Hover annotation
+			def update_annot(ind):
+				pos = splot.get_offsets()[ind["ind"][0]]
+				self.annot.xy = pos
+				text = ", ".join([str(self.dataset[self.label_col-1][n]) for n in ind["ind"]])
+				self.annot.set_text(text)
+				self.annot.get_bbox_patch().set_facecolor("wheat")
+				self.annot.get_bbox_patch().set_alpha(0.8)
+			def hover(event):
+				vis = self.annot.get_visible()
+				if event.inaxes == self.plot_axes:
+					cont, ind = splot.contains(event)
+					if cont:
+						update_annot(ind)
+						self.annot.set_visible(True)
+					else:
+						if vis:
+							self.annot.set_visible(False)
+					self.plotfig_canvas.draw_idle()
+			if self.label_col is not None:
+				self.annot = self.plot_axes.annotate("", xy=(0,0), xytext=(8,12), textcoords="offset points", \
+						bbox={"boxstyle": "round", "fc": "w"}, arrowprops={"arrowstyle": "->"})
+				self.annot.set_visible(False)
+				self.canvas_conn_id = self.plotfig_canvas.mpl_connect("motion_notify_event", hover)
+			else:
+				if self.canvas_conn_id is not None:
+					self.plotfig_canvas.mpl_disconnect(self.canvas_conn_id)
+			# Legend
+			if len(self.plot_handle_list) > 0:
+				self.plot_axes.legend(handles=self.plot_handle_list, labels=self.plot_label_list)
+
+			self.plot_axes.set_xlabel(self.umap_labels[0])
+			self.plot_axes.set_ylabel(self.umap_labels[1])
+			self.plotfig_canvas.draw()
+			self.plot_nav.update()
+			self.dlg.bind("<Alt-a>", self.set_alpha)
+			self.cluster_btn["state"] = tk.NORMAL
+			self.clust_save_btn["state"] = tk.DISABLED
+			self.loading_dlg.hide()
 
 	def kclusters(self):
 		# Compute and display k-means clusters
@@ -9088,6 +9091,7 @@ class FitDistDialog(object):
 			fit_pdf = fitter.pdf(self.dataset[0], *fitres) * N
 			sse = sum([(fit_pdf[i] - self.dataset[0][i])**2 for i in range(N)])
 			self.statdata.append(["SSE", fp_display(sse, figs=5)])
+			self.statdata.append(["RMSE", fp_display(math.sqrt(sse/N))])
 			gf_args = dict(zip(argnames, fitres))
 			gf_succeeded = False
 			gf_statname = None

{mapdata-3.6.1 → mapdata-3.6.4/mapdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapdata
-Version: 3.6.1
+Version: 3.6.4
 Summary: An interactive map and table explorer for geographic coordinates in a spreadsheet, CSV file, or database
 Home-page: https://osdn.net/project/mapdata/
 Author: Dreas Nielsen
@@ -134,6 +134,8 @@ A configuration file template and additional bitmap symbols are included with th
  
   * [pymannkendall](https://pypi.org/project/pymannkendall/)
 
+  * [pynndescent](https://pypi.org/project/pynndescent/)
+ 
   * [pyproj](https://pypi.org/project/pyproj/)
  
   * [scikit-learn](https://pypi.org/project/scikit-learn/)
@@ -146,6 +148,8 @@ A configuration file template and additional bitmap symbols are included with th
 
   * [tkintermapview](https://pypi.org/project/tkintermapview/)
 
+  * [umap-learn](https://pypi.org/project/umap-learn/)
+
   * [xlrd](https://pypi.org/project/xlrd/)
 
 If *mapdata.py* is used to query a database to obtain a data set to view and

{mapdata-3.6.1 → mapdata-3.6.4}/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.6.1',
+	version='3.6.4',
 	description="An interactive map and table explorer for geographic coordinates in a spreadsheet, CSV file, or database",
 	author='Dreas Nielsen',
 	author_email='cortice@tutanota.com',