update

app.py

@@ -326,7 +326,7 @@ with gr.Blocks() as demo:
 	    	"unassignedInputs" : None,
 	    	"missingTemplates" : None,
 	    	"batchNum" : None,
-	    	"mappingData" : [
+	    	"mappingResults" : [
 	    	{
 				"newOrder" : None,
 				"fillFlags" : None
@@ -487,8 +487,8 @@ with gr.Blocks() as demo:
 				prev_target_idx = channel_info["templateDict"][prev_target_name]["index"]
 				selected_idx = channel_info["inputDict"][selected_radio]["index"]
 				
-				stage1_info["mappingData"][0]["newOrder"][prev_target_idx] = [selected_idx]
-				stage1_info["mappingData"][0]["fillFlags"][prev_target_idx] = False
+				stage1_info["mappingResults"][0]["newOrder"][prev_target_idx] = [selected_idx]
+				stage1_info["mappingResults"][0]["fillFlags"][prev_target_idx] = False
 				channel_info["templateDict"][prev_target_name]["matched"] = True
 				channel_info["inputDict"][selected_radio]["assigned"] = True				
 				#print(prev_target_name, '<-', selected_radio)
@@ -563,10 +563,10 @@ with gr.Blocks() as demo:
 				value of the data from the selected channels. (By default, the 4 nearest channels are pre-selected.)
 				"""
 				# find the 4 nearest in_channels for each unmatched tpl_channels
-				stage1_info["mappingData"][0]["newOrder"] = app_utils.find_neighbors(
+				stage1_info["mappingResults"][0]["newOrder"] = app_utils.find_neighbors(
 																		channel_info,
 																		stage1_info["missingTemplates"],
-																		stage1_info["mappingData"][0]["newOrder"])
+																		stage1_info["mappingResults"][0]["newOrder"])
 				# initialize the progress indication label
 				step3 = {
 					"count" : 1,
@@ -576,7 +576,7 @@ with gr.Blocks() as demo:
 				chkbox_label = '{} (1/{})'.format(target_name, step3["totalNum"])
 				
 				target_idx = channel_info["templateDict"][target_name]["index"]
-				chkbox_value = stage1_info["mappingData"][0]["newOrder"][target_idx]
+				chkbox_value = stage1_info["mappingResults"][0]["newOrder"][target_idx]
 				chkbox_value = [channel_info["inputOrder"][i] for i in chkbox_value]
 				
 				stage1_info["step3"] = step3
@@ -607,7 +607,7 @@ with gr.Blocks() as demo:
 			prev_target_name = stage1_info["missingTemplates"][step3["count"]-1]
 			prev_target_idx = channel_info["templateDict"][prev_target_name]["index"]
 			selected_indices = [channel_info["inputDict"][channel]["index"] for channel in selected_chkbox]
-			stage1_info["mappingData"][0]["newOrder"][prev_target_idx] = selected_indices
+			stage1_info["mappingResults"][0]["newOrder"][prev_target_idx] = selected_indices
 			#print(f'{prev_target_name}({prev_target_idx}): {selected_indices}')
 			# ----------------------------------------------------------------------------------
 			md = """
@@ -686,8 +686,8 @@ with gr.Blocks() as demo:
 			prev_target_idx = channel_info["templateDict"][prev_target_name]["index"]
 			selected_idx = channel_info["inputDict"][selected]["index"]
 			
-			stage1_info["mappingData"][0]["newOrder"][prev_target_idx] = [selected_idx]
-			stage1_info["mappingData"][0]["fillFlags"][prev_target_idx] = False
+			stage1_info["mappingResults"][0]["newOrder"][prev_target_idx] = [selected_idx]
+			stage1_info["mappingResults"][0]["fillFlags"][prev_target_idx] = False
 			channel_info["templateDict"][prev_target_name]["matched"] = True
 			channel_info["inputDict"][selected]["assigned"] = True
 			#print(prev_target_name, '<-', selected)
@@ -737,7 +737,7 @@ with gr.Blocks() as demo:
 		prev_target_name = stage1_info["missingTemplates"][step3["count"]-1]
 		prev_target_idx = channel_info["templateDict"][prev_target_name]["index"]
 		selected_indices = [channel_info["inputDict"][channel]["index"] for channel in selected]
-		stage1_info["mappingData"][0]["newOrder"][prev_target_idx] = selected_indices
+		stage1_info["mappingResults"][0]["newOrder"][prev_target_idx] = selected_indices
 		#print(f'{prev_target_name}({prev_target_idx}): {selected_indices}')
 		
 		# ------------------------update information for the new round--------------------------
@@ -747,7 +747,7 @@ with gr.Blocks() as demo:
 		chkbox_label = '{} ({}/{})'.format(target_name, step3["count"], step3["totalNum"])
 		
 		target_idx = channel_info["templateDict"][target_name]["index"]
-		chkbox_value = stage1_info["mappingData"][0]["newOrder"][target_idx]
+		chkbox_value = stage1_info["mappingResults"][0]["newOrder"][target_idx]
 		chkbox_value = [channel_info["inputOrder"][i] for i in chkbox_value]
 		
 		stage1_info["step3"] = step3
@@ -834,7 +834,7 @@ with gr.Blocks() as demo:
 	
 	def run_model(stage1_info, stage2_info, modelname):
 		batch_num = stage1_info["batchNum"]
-		mapping_data = stage1_info["mappingData"]
+		mapping_results = stage1_info["mappingResults"]
 		samplerate = stage2_info["sampleRate"]
 		filepath = stage2_info["filePath"]
 		filename = stage2_info["fileNames"]["inputData"]
@@ -844,8 +844,8 @@ with gr.Blocks() as demo:
 		for i in range(batch_num):
 			yield {batch_md : gr.Markdown('Running model({}/{})...'.format(i+1, batch_num))}
 			
-			new_idx = mapping_data[i]["newOrder"]
-			fill_flags = mapping_data[i]["fillFlags"]
+			new_idx = mapping_results[i]["newOrder"]
+			fill_flags = mapping_results[i]["fillFlags"]
 			m_filename = 'mapped_{:02d}.csv'.format(i+1)
 			d_filename = 'denoised_{:02d}.csv'.format(i+1)
 			try:

app_utils.py

@@ -321,7 +321,7 @@ def optimal_mapping(channel_info):
 	if missing_channels != []:
 	    new_idx = find_neighbors(channel_info, missing_channels, new_idx)
 	
-	mapping_data = {
+	result = {
 		"newOrder" : new_idx,
 		"fillFlags" : fill_flags
 	}
@@ -329,31 +329,31 @@ def optimal_mapping(channel_info):
 	    "templateDict" : tpl_dict,
 	    "inputDict" : in_dict
 	})
-	return mapping_data, channel_info
+	return result, channel_info
 
 def mapping_result(stage1_info, channel_info, filename):
 	unassigned_num = len(stage1_info["unassignedInputs"])
 	batch_num = math.ceil(unassigned_num/30) + 1
 	
 	# map the remaining in_channels
-	all_mapping_data = stage1_info["mappingData"]
+	results = stage1_info["mappingResults"]
 	for i in range(1, batch_num):
 		# optimally select 30 in_channels to map to the tpl_channels based on proximity
-		new_data, channel_info = optimal_mapping(channel_info)
-		all_mapping_data += [new_data]
+		result, channel_info = optimal_mapping(channel_info)
+		results += [result]
 	
-	results = {
+	data = {
 		#"templateOrder" : channel_info["templateOrder"],
 		#"inputOrder" : channel_info["inputOrder"],
 		"batchNum" : batch_num,
-		"mappingData" : stage1_info["mappingData"]
+		"mappingResults" : stage1_info["mappingResults"]
 	}
 	with open(filename, 'w') as jsonfile:
-		jsonfile.write(json.dumps(results))
+		jsonfile.write(json.dumps(data))
 	
 	stage1_info.update({
 		"batchNum" : batch_num,
-		"mappingData" : all_mapping_data
+		"mappingResults" : results
 	})
 	return stage1_info, channel_info