update

app.py

@@ -27,6 +27,7 @@ def solver_plot(data_npy, boost=False):
     return actual_fig, solution_fig, actual_ac, solution_ac
     
 def demo_plot(city, facility):
+    facility_name = ["🏫 School", "🏥 Hospital", "🌳 Park"]
     all_facility = ["🏫 School", "🏥 Hospital", "🌳 Park"]
     for i in range(len(all_facility)):
         if all_facility[i] in facility:
@@ -55,7 +56,7 @@ def demo_plot(city, facility):
                 size=10,
                 color=px.colors.qualitative.Plotly[i]
             ),
-            name=f'Facility {i+1}'
+            name=facility_name[i],
         ))
         solution_fig.add_trace(go.Scattermapbox(
             lat=positions[solution_facility[:, i] == 1][:, 0],
@@ -65,7 +66,7 @@ def demo_plot(city, facility):
                 size=10,
                 color=px.colors.qualitative.Plotly[i]
             ),
-            name=f'Facility {i+1}'
+            name=facility_name[i],
         ))
     
         actual_fig.update_layout(
@@ -125,7 +126,7 @@ def solver_plot(data_npy, boost=False):
         
         actual_facility = []
         for i in range(2+p, 2+2*p):
-            actual_facility.append(bool(int(row[i])))
+            actual_facility.append(bool(int(float(row[i]))))
         actual_facilities.append(actual_facility)
     positions = np.array(positions)
     demands = np.array(demands)
@@ -190,24 +191,17 @@ def solver_plot(data_npy, boost=False):
     return actual_fig, solution_fig, actual_ac, solution_ac
     
 
-
-
 def get_example():
     return [
-        ("40.71 -73.93 213 0\n\
-            40.72 -73.99 15 1\n\
-            40.65 -73.88 365 1\n\
-            40.57 -73.96 629 0\n\
-            40.70 -73.97 106 0\n\
-            40.61 -73.95 189 1"),
-        ("40.71 -73.93 213 124 0 1\n\
-            40.72 -73.99 15 43 1 0\n\
-            40.65 -73.88 365 214 1 0\n\
-            40.57 -73.96 629 431 0 1\n\
-            40.70 -73.97 106 241 0 1\n\
-            40.61 -73.95 189 264 1 0")
+        ('40.71 -73.93 213 0\n40.72 -73.99 15 1\n40.65 -73.88 365 1\n40.57 -73.96 629 0\n40.70 -73.97 106 0\n40.61 -73.95 189 1'),
+        ("40.71 -73.93 213 124 0 1\n40.72 -73.99 15 43 1 0\n40.65 -73.88 365 214 1 0\n40.57 -73.96 629 431 0 1\n40.70 -73.97 106 241 0 1\n40.61 -73.95 189 264 1 0")
         ]
-    
+
+
+def load_npy_file(file_obj):
+    data = np.load(file_obj.name)
+    string_array = '\n'.join([' '.join(map(str, row)) for row in data])
+    return string_array
     
 
 with gr.Blocks() as demo:
@@ -218,39 +212,39 @@ with gr.Blocks() as demo:
         btn = gr.Button(value="🚀 Generate")
         with gr.Row():
             actual_map = gr.Plot(label='Actual Facility Distribution')
-            solution_map = gr.Plot(label='Relocation Facility Distribution')
+            solution_map = gr.Plot(label='Relocated Facility Distribution')
         with gr.Row():
             actual_ac = gr.Textbox(label='Real-world Access Cost')
-            solution_ac = gr.Textbox(label='Relocation Access Cost')
+            solution_ac = gr.Textbox(label='Relocated Access Cost')
     demo.load(fn=demo_plot, inputs=[city, facility], outputs=[actual_map, solution_map, actual_ac, solution_ac])
     btn.click(fn=demo_plot, inputs=[city, facility], outputs=[actual_map, solution_map, actual_ac, solution_ac])
     
-    gr.Markdown("## FLP&IUMFLP Solver")
+    gr.Markdown("## FLP & IUMFLP Solver")
     with gr.Column():
         with gr.Row():
             data_npy = gr.Textbox(label="Input")
             data_file = gr.UploadButton(
             label="📁 Upload a npy file",
-            file_count="multiple", 
+            file_count="single", 
             file_types=[".npy"])
         with gr.Row():
-            boost = gr.Checkbox(label="Turbo Boost", value=False)
+            gr.Examples(
+                examples=get_example(),
+                inputs=[data_npy],
+                fn=plot_from_npy,
+                outputs=[actual_map, solution_map],
+            )
+        with gr.Row():
+            boost = gr.Checkbox(label="Turbo Boost (accelerate solution generation with fewer SWAP steps)", value=False)
             btn2 = gr.Button(value="🚀 Generate")
         with gr.Row():
-            actual_map = gr.Plot(label='Real-world Facility Distribution')
-            solution_map = gr.Plot(label='Relocation Facility Distribution')
+            actual_map = gr.Plot(label='Initial Solution')
+            solution_map = gr.Plot(label='Final Solution')
         with gr.Row():
-            actual_ac = gr.Textbox(label='Real-world Access Cost')
-            solution_ac = gr.Textbox(label='Relocation Access Cost')
-    data_file.upload(fn=solver_plot, inputs=[data_file, boost], outputs=[actual_map, solution_map, actual_ac, solution_ac])
+            actual_ac = gr.Textbox(label='Initial Access Cost')
+            solution_ac = gr.Textbox(label='Final Access Cost')
+    data_file.upload(fn=load_npy_file, inputs=[data_file], outputs=[data_npy])
     btn2.click(fn=solver_plot, inputs=[data_npy, boost], outputs=[actual_map, solution_map, actual_ac, solution_ac])
     
-    gr.Examples(
-        examples=get_example(),
-        inputs=[data_npy],
-        fn=plot_from_npy,
-        outputs=[actual_map, solution_map],
-    )
-
 if __name__ == "__main__":
-    demo.launch()
+    demo.launch()