update

app.py

@@ -230,13 +230,13 @@ with gr.Blocks() as demo:
 			desc_md = gr.Markdown(visible=False)
 			out_json_file = gr.File(visible=False)
 			# --------------------mapping--------------------
-			# step1 : initial matching and scaling
+			# step1
 			with gr.Row():
 				tpl_img = gr.Image("./template_montage.png", label="Template montage", visible=False)
 				mapped_img = gr.Image(label="Matching results", visible=False)
-			# step2 : forward unmatched input channels to empty template channels
+			# step2
 			radio_group = gr.Radio(elem_id="radio-group", visible=False)
-			# step3 : fill the remaining template channels
+			# step3
 			with gr.Row():
 				in_fillmode = gr.Dropdown(choices=["mean", "zero"],
 											value="mean",
@@ -303,7 +303,6 @@ with gr.Blocks() as demo:
 		stage1_id = uuid.uuid4().hex
 		os.mkdir(rootpath+'/'+stage1_id+'/')
 		
-		# initialize stage1_info, stage2_info, channel_info
 		stage1_info = {
 			"id" : stage1_id,
 			"filePath" : rootpath+'/'+stage1_id+'/',
@@ -322,7 +321,7 @@ with gr.Blocks() as demo:
 	    	"mappingData" : [
 	    	{
 				"newOrder" : None,
-				"fillFlags" : None,
+				"fillFlags" : None
 				#"channelUsageNum" : None
 			}
 	    	]
@@ -401,7 +400,6 @@ with gr.Blocks() as demo:
 			matched_num = 30 - len(stage1_info["missingTemplates"])
 			
 			# step1 to step4
-			# the in_channels has all the 30 tpl_channels (in_num>=30)
 			if matched_num == 30:
 				md = """
 				### Mapping Results
@@ -421,9 +419,8 @@ with gr.Blocks() as demo:
 						next_btn : gr.Button(visible=False),
 						out_json_file : gr.File(filename, visible=True)}
 			
-			# step1 to step2
-			# matched_num < 30, and there're still some unmatched in_channels
-			elif in_num > matched_num:
+			# step1 to step2  (matched_num<30, and there're still some unmatched in_channels)
+			elif in_num > matched_num: 
 				md = """
 				### Step2: Forwarding Unmatched Channels
 				Select one of your unmatched channels to forward its data to the empty template channel 
@@ -456,8 +453,7 @@ with gr.Blocks() as demo:
 							step2_btn : gr.Button(visible=True),
 							next_btn : gr.Button(visible=False)}
 			
-			# step1 to step3-1
-			# in_num < 30, but all of them can match to some tpl_channels
+			# step1 to step3-1  (in_num<30, but all of them can match to some tpl_channels)
 			elif in_num == matched_num:
 				md = """
 				### Step3: Filling Remaining Template Channels
@@ -489,22 +485,20 @@ with gr.Blocks() as demo:
 				#print(prev_target_name, '<-', selected_radio)
 			
 			# -----------------------update information for the next step-----------------------
-			# update the list of unassignedInputs to exclude the selected in_channel of the previous round
+			# exclude the selected in_channel of the previous round
 			stage1_info["unassignedInputs"] = app_utils.get_unassigned_inputs(channel_info["inputOrder"],
 																			  channel_info["inputDict"])
-			# update the list of missingTemplates to exclude those filled in step2
+			# exclude the tpl_channels filled in step2
 			stage1_info["missingTemplates"] = app_utils.get_empty_templates(channel_info["templateOrder"],
 																			channel_info["templateDict"])
 			# -----------------------------determine the next step------------------------------
 			# step2 to step4
-			# all the unmatched tpl_channels were filled
 			if len(stage1_info["missingTemplates"]) == 0:
 				md = """
 				### Mapping Results
 				The mapping process has been finished.  
 				Download the file below if you plan to run the models using the <a href="">source code</a>.
 				"""
-				# finalize and save the mapping results
 				filename = stage1_info["fileNames"]["output_json"]
 				stage1_info, channel_info = app_utils.mapping_result(stage1_info, channel_info, filename)
 				
@@ -542,7 +536,6 @@ with gr.Blocks() as demo:
 				The mapping process has been finished.  
 				Download the file below if you plan to run the models using the <a href="">source code</a>.
 				"""
-				# finalize and save the mapping results
 				filename = stage1_info["fileNames"]["output_json"]
 				stage1_info, channel_info = app_utils.mapping_result(stage1_info, channel_info, filename)
 				
@@ -612,7 +605,6 @@ with gr.Blocks() as demo:
 			The mapping process has been finished.  
 			Download the file below if you plan to run the models using the <a href="">source code</a>.
 			"""
-			# finalize and save the mapping results
 			filename = stage1_info["fileNames"]["output_json"]
 			stage1_info, channel_info = app_utils.mapping_result(stage1_info, channel_info, filename)
 			
@@ -663,7 +655,7 @@ with gr.Blocks() as demo:
 			return {step2_btn : gr.Button(visible=False),
 					next_btn : gr.Button(visible=True)}
 		else:
-			return {step2_btn : gr.Button()} # change nothing
+			return {step2_btn : gr.Button()}
 	# clear the selected value and reset the buttons
 	@clear_btn.click(inputs = stage1_json, outputs = [radio_group, step2_btn, next_btn])
 	def clear_value(stage1_info):
@@ -691,7 +683,7 @@ with gr.Blocks() as demo:
 		# ------------------------update information for the new round--------------------------
 		stage1_info["fillingCount"] += 1
 		
-		# update the list of unassignedInputs to exclude the selected in_channel of the previous round
+		# exclude the selected in_channel of the previous round
 		stage1_info["unassignedInputs"] = app_utils.get_unassigned_inputs(channel_info["inputOrder"], channel_info["inputDict"])
 		
 		target_name = stage1_info["missingTemplates"][stage1_info["fillingCount"]-1]
@@ -789,7 +781,7 @@ with gr.Blocks() as demo:
 			return gr.Button(interactive=True)
 		else:
 			return gr.Button(interactive=False)
-	
+	# interrupt Stage2
 	@cancel_btn.click(inputs = stage2_json, outputs = [stage2_json, cancel_btn, batch_md])
 	def stop_processing(stage2_info):
 		utils.dataDelete(stage2_info["filePath"])
@@ -828,32 +820,23 @@ with gr.Blocks() as demo:
 	def run_model(stage1_info, stage2_info, modelname):
 		batch_num = stage1_info["totalBatchNum"]
 		mapping_data = stage1_info["mappingData"]
-		
 		samplerate = stage2_info["sampleRate"]
 		filepath = stage2_info["filePath"]
 		filename = stage2_info["fileNames"]["input_data"]
 		new_filename = stage2_info["fileNames"]["output_data"]
 		
-		break_flag = False # indicate if the process has been interrupted by the user
+		break_flag = False # indicate if the process has been interrupted
 		for i in range(batch_num):
-			md = 'Running model({}/{})...'.format(i+1, batch_num)
-			yield {batch_md : gr.Markdown(md)}
+			yield {batch_md : gr.Markdown('Running model({}/{})...'.format(i+1, batch_num))}
 			
-			# establish a temp folder
-			try:
-				os.mkdir(filepath+'temp_data/')
-			except FileNotFoundError:
-				print('break1')
-				break_flag = True
-				break
-			
-			# get the mapped index order and the filled status for each tpl_channels
 			new_idx = mapping_data[i]["newOrder"]
 			fill_flags = mapping_data[i]["fillFlags"]
-			# ----------------------------------------------------------------------------------
 			m_filename = 'mapped_{:02d}.csv'.format(i+1)
 			d_filename = 'denoised_{:02d}.csv'.format(i+1)
 			try:
+				# establish a temp folder
+				os.mkdir(filepath+'temp_data/')
+				
 				# step1: Reorder input data
 				data_shape = app_utils.reorder_data(new_idx, fill_flags, filename, filepath+'temp_data/'+m_filename)
 				# step2: Data preprocessing
@@ -863,11 +846,11 @@ with gr.Blocks() as demo:
 				# step4: Restore original order
 				app_utils.restore_order(i, data_shape, new_idx, fill_flags, filepath+'temp_data/'+d_filename, new_filename)
 			except FileNotFoundError:
-				print('break2')
+				print('break!!')
 				break_flag = True
 				break
-			# ----------------------------------------------------------------------------------
-			utils.dataDelete(filepath+'temp_data/')
+			else:
+				utils.dataDelete(filepath+'temp_data/')
 		
 		if break_flag == True:
 			yield {run_btn : gr.Button(visible=True),

app_utils.py

@@ -39,8 +39,7 @@ def restore_order(batch_cnt, raw_data_shape, idx_order, fill_flags, filename, ne
 		new_data = utils.read_train_data(new_filename)
 	
 	for i, (idx_set, flag) in enumerate(zip(idx_order, fill_flags)):
-		# ignore if this channel was filled using "fillmode"
-		if flag == False:
+		if flag == False: # ignore if this channel was filled using "fillmode"
 			new_data[idx_set[0], :] = d_data[i, :]
 	
 	utils.save_data(new_data, new_filename)
@@ -63,7 +62,7 @@ def read_montage_data(loc_file):
 	tpl_dict = {}
 	in_dict = {}
 	
-	# convert all channel names to uppercase and store the channel information
+	# convert all channel names to uppercase and store their information
 	for i, channel in enumerate(tpl_order):
 		up_channel = str.upper(channel)
 		tpl_montage.rename_channels({channel: up_channel})
@@ -163,14 +162,14 @@ def align_coords(channel_info, tpl_montage, in_montage):
 	fig = [tpl_montage.plot(), in_montage.plot()]
 	ax = [fig[0].axes[0], fig[1].axes[0]]
 	
-	# extract the displayed 2D coordinates from the plots
+	# extract the displayed 2D coordinates
 	all_tpl = ax[0].collections[0].get_offsets().data
 	all_in= ax[1].collections[0].get_offsets().data
 	matched_tpl = np.array([all_tpl[tpl_dict[channel]["index"]] for channel in matched])
 	matched_in = np.array([all_in[in_dict[channel]["index"]] for channel in matched])
 	plt.close('all')
 	
-	# apply TPS to transform in_channels positions to align with tpl_channels positions
+	# apply TPS to transform in_channels to align with tpl_channels positions
 	rbf_x = Rbf(matched_in[:,0], matched_in[:,1], matched_tpl[:,0], function='thin_plate')
 	rbf_y = Rbf(matched_in[:,0], matched_in[:,1], matched_tpl[:,1], function='thin_plate')
 	
@@ -179,7 +178,6 @@ def align_coords(channel_info, tpl_montage, in_montage):
 	transformed_in_y = rbf_y(all_in[:,0], all_in[:,1])
 	transformed_in = np.vstack((transformed_in_x, transformed_in_y)).T
 	
-	# store the 2D positions
 	for i, channel in enumerate(tpl_order):
 		tpl_dict[channel]["coord_2d"] = all_tpl[i]
 	for i, channel in enumerate(in_order):
@@ -201,7 +199,6 @@ def align_coords(channel_info, tpl_montage, in_montage):
 	transformed_in_z = rbf_z(all_in[:,0], all_in[:,1], all_in[:,2])
 	transformed_in = np.vstack((transformed_in_x, transformed_in_y, transformed_in_z)).T
 	
-	# update in_channels' 3D positions
 	for i, channel in enumerate(in_order):
 		in_dict[channel]["coord_3d"] = transformed_in[i].tolist()
 	
@@ -296,7 +293,7 @@ def optimal_mapping(channel_info):
 		cost_matrix = np.full((30, 30), 1e6) # add dummy channels to ensure num_col >= num_row
 	else:
 		cost_matrix = np.zeros((30, len(unassigned)))
-	# fill the cost matrix with Euclidean distances between tpl_channels and unassigned in_channels
+	# fill the cost matrix with Euclidean distances between tpl and unassigned in_channels
 	for i in range(30):
 		for j in range(len(unassigned)):
 			cost_matrix[i][j] = np.linalg.norm((all_tpl[i]-unassigned_in[j])*1000)
@@ -345,7 +342,6 @@ def mapping_result(stage1_info, channel_info, filename):
 		new_data, channel_info = optimal_mapping(channel_info)
 		all_mapping_data += [new_data]
 	
-	# save the mapping results
 	new_dict = {
 		#"templateOrder" : channel_info["templateOrder"],
 		#"inputOrder" : channel_info["inputOrder"],