Improvements to the visualization

app.py

@@ -68,7 +68,7 @@ def parse_all_data(path):
     for subfolder in subfolders:
         data[subfolder] = {
             'wnd_action_trace': pd.read_csv(f'{path}/{subfolder}/actionTrace_Agent_PIC Blaze.csv'),
-            'all_action_trace': parse_action_trace(f'{path}/{subfolder}/actionTrace.csv', exclude),
+            # 'all_action_trace': parse_action_trace(f'{path}/{subfolder}/actionTrace.csv', exclude),
         }
         data[subfolder]['aircraft_data'] = {}
         for file in os.listdir(f'{path}/{subfolder}'):
@@ -84,22 +84,22 @@ def parse_all_data(path):
 app.layout = html.Div([
     html.Div([
         html.Div([
-            html.Div("Select the desired input conditions, then click 'Simulate!':", id='text1'),
+            html.Div("Select the desired input conditions and see how the strategy on the What's Next Diagram changes:", id='text1'),
             # html.Label("Contingency Time: "),
             # dcc.Input( id='cont-time', type='text', placeholder='Time at which the lost link event occurs (set to "ALONGTIMEAWAY" (no quotes) if no lost link event needs to occur)', style={'width': '80%'}),
             # html.Br(),
-            html.Label("backgroundDivert: "),
+            html.Label("What is the behavior of Unmanned Aerial Vehicle when a lost link is detected?"),
             dcc.RadioItems(
                 id='backgroundDivert',
                 options=[
-                    {'label': 'Divert', 'value': 'True'},
-                    {'label': 'Continue', 'value': 'False'}
+                    {'label': 'Divert to nearest vertiport', 'value': 'True'},
+                    {'label': 'Continue to fly along its approved route', 'value': 'False'}
                 ],
                 value='True',
                 labelStyle={'display': 'inline-block'}
             ),
             html.Br(),
-            html.Label("Required certainty: A value that represents how high certainty needs to be before Blaze will make a decision."),
+            html.Label("Required certainty: A value that represents how certain the pilot of Blaze needs to be about what's next before they make a decision."),
             html.Br(),
             dcc.Slider(
                 id='IFthreshold',
@@ -113,7 +113,7 @@ app.layout = html.Div([
             # style={'width': '100%'},  # Set the width of the div containing the slider to 80% of the container
             # dcc.Input( id='IFthreshold', type='text', placeholder='A `double` which represents the interaction factor at which Blaze will make a decision.', style={'width': '80%'}),
             # html.Br(),
-            html.Label("Time buffer: The time left before a decision must be made."),
+            html.Label("Time buffer: How many seconds before the Blazes `point of no return` should Blaze make decision, even if not quite certain about what's next?"),
             dcc.Slider(
                 id='TAthreshold',
                 min=10,
@@ -125,7 +125,7 @@ app.layout = html.Div([
             ),
             # dcc.Input( id='TAthreshold', type='text', placeholder='An `integer` which represents how much time needs to be left before Blaze makes a decision.', style={'width': '80%'}),
             # html.Br(),
-            html.Label("Wait interval: How long to wait before the next update is made."),
+            html.Label("Wait interval: How often should Blaze receive new information and revise projections?"),
             dcc.Slider(
                 id='updateTime',
                 min=20,
@@ -140,23 +140,38 @@ app.layout = html.Div([
             # html.Button('Simulate!', id='button', n_clicks=0),
         ], style={'width': '50%', 'border': '1px solid gray'}),
 
+        # html.Div([
+        #     html.Div("Next, input the relative path to your results folder, then click 'Submit'. This will load the data:", id='text2'),
+        #     dcc.Input(
+        #         id='path-input',
+        #         # value='data',
+        #         type='text',
+        #         placeholder='Type your path... For example, ../wmc5.1/Scenario/AAMv2/Results',
+        #         style={'width': '70%'}  # Make the input wider
+        #     ),
+        #     html.Button('Submit', id='submit-button', n_clicks=0),
+        #     # Create a dropdown menu with the subfolders as options
+        #     # html.Div("Once all subfolders are loaded (representing the different conditions you ran in WMC), you can select which one to plot:", id='text2'),
+        #     # dcc.Dropdown(
+        #     #     id='subfolder-dropdown',
+        #     #     value=None #subfolders[0]  # Default value
+        #     #     )
+        # ], style={'width': '50%', 'border': '1px solid gray'}),
+
         html.Div([
-            html.Div("Next, input the relative path to your results folder, then click 'Submit'. This will load the data:", id='text2'),
-            dcc.Input(
-                id='path-input',
-                # value='data',
-                type='text',
-                placeholder='Type your path... For example, ../wmc5.1/Scenario/AAMv2/Results',
-                style={'width': '70%'}  # Make the input wider
+            html.Label("Use the slider to move through time."),
+            dcc.Slider(
+                id='time-slider',
+                min=start_time,
+                max=end_time,
+                value=start_time+100,
+                marks={str(time): str(time) for time in range(start_time, end_time+1, 50)},
+                updatemode='drag'
             ),
-            html.Button('Submit', id='submit-button', n_clicks=0),
-            # Create a dropdown menu with the subfolders as options
-            # html.Div("Once all subfolders are loaded (representing the different conditions you ran in WMC), you can select which one to plot:", id='text2'),
-            # dcc.Dropdown(
-            #     id='subfolder-dropdown',
-            #     value=None #subfolders[0]  # Default value
-            #     )
-        ], style={'width': '50%', 'border': '1px solid gray'}),
+            # style={'width': '100%'}  # Set the width of the div containing the slider to 80% of the container
+        ], style={'width': '50%', 'border': '1px solid gray'}
+        )
+
     ], style={'display': 'flex'}),
 
     html.Div([
@@ -165,7 +180,7 @@ app.layout = html.Div([
             dcc.Dropdown(
                 id='variable-dropdown',
                 # options=[{'label': i, 'value': i} for i in subfolders],
-                value=None #subfolders[0]  # Default value
+                value='altitude_ft' #subfolders[0]  # Default value
             ),
             dcc.Graph(id='altitude-series') # Third graph
         ], style={'width': '39%', 'display': 'inline-block', 'border': '1px solid gray'}),      
@@ -174,18 +189,6 @@ app.layout = html.Div([
         ], style={'width': '59%', 'display': 'inline-block', 'border': '1px solid gray'})
     ], style={'display': 'flex'}),
 
-    html.Div(
-        dcc.Slider(
-            id='time-slider',
-            min=start_time,
-            max=end_time,
-            value=start_time+100,
-            marks={str(time): str(time) for time in range(start_time, end_time+1, 50)},
-            updatemode='drag'
-        ),
-        style={'width': '100%'}  # Set the width of the div containing the slider to 80% of the container
-    )
-
 ])
 
 # @app.callback(
@@ -215,31 +218,31 @@ app.layout = html.Div([
             # return f"error!"
     
 # Load data when the app starts and store it in the hidden div
-@app.callback(
-    # dash.dependencies.Output('subfolder-dropdown', 'options'),
-    # dash.dependencies.Output('variable-dropdown', 'options'),
-    dash.dependencies.Output('submit-button', 'n_clicks'),  # Add this output to reset submit button clicks
-    [dash.dependencies.Input('submit-button', 'n_clicks')],
-    [dash.dependencies.Input('path-input', 'value')],
-)
-def load_data(n_clicks, selected_path):
-    print("selected path is",selected_path)
-    global data_store
-
-    if n_clicks > 0:
-        if selected_path is None or not os.path.isdir(selected_path):
-            return [], []
-        subfolder_labels, data = parse_all_data(selected_path)
-        print('subfolders',subfolder_labels)
-        if data is None:
-            data = {}
-        # Store data in the global dictionary
-        data_store = data
-        labels = list(data[list(data.keys())[0]]['aircraft_data'][list(data[list(data.keys())[0]]['aircraft_data'].keys())[0]].columns.tolist())  # Extracting column names for the first aircraft-specific dataframe
-        return subfolder_labels, labels, 0
-    else:
-        # return [], [], 0
-        return 0
+# @app.callback(
+#     # dash.dependencies.Output('subfolder-dropdown', 'options'),
+#     # dash.dependencies.Output('variable-dropdown', 'options'),
+#     dash.dependencies.Output('submit-button', 'n_clicks'),  # Add this output to reset submit button clicks
+#     [dash.dependencies.Input('submit-button', 'n_clicks')],
+#     [dash.dependencies.Input('path-input', 'value')],
+# )
+# def load_data(n_clicks, selected_path):
+#     print("selected path is",selected_path)
+#     global data_store
+
+#     if n_clicks > 0:
+#         if selected_path is None or not os.path.isdir(selected_path):
+#             return [], []
+#         subfolder_labels, data = parse_all_data(selected_path)
+#         print('subfolders',subfolder_labels)
+#         if data is None:
+#             data = {}
+#         # Store data in the global dictionary
+#         data_store = data
+#         labels = list(data[list(data.keys())[0]]['aircraft_data'][list(data[list(data.keys())[0]]['aircraft_data'].keys())[0]].columns.tolist())  # Extracting column names for the first aircraft-specific dataframe
+#         return 0
+#     else:
+#         # return [], [], 0
+#         return 0
     
 
 # Define the callback to update the graphs based on the slider value
@@ -247,6 +250,7 @@ def load_data(n_clicks, selected_path):
     dash.dependencies.Output('time-series', 'figure'),
     dash.dependencies.Output('map', 'figure'),
     dash.dependencies.Output('altitude-series', 'figure'),
+    dash.dependencies.Output('variable-dropdown', 'options'),
     # dash.dependencies.Output('timeline', 'figure'),
     #  dash.dependencies.Input('path-input', 'value'),
     # [dash.dependencies.Input('subfolder-dropdown', 'value'),
@@ -269,9 +273,10 @@ def load_data(n_clicks, selected_path):
 def update_graph(selected_time, selected_variable, backgroundDivert, RequiredCertainty, TimeBuffer, WaitInterval): #selected_subfolder, 
     
     selected_subfolder = "exampleTime=200"+backgroundDivert+"_"+str(RequiredCertainty)+"_"+str(TimeBuffer)+"_"+str(WaitInterval)
-
+    print(selected_subfolder)
     if selected_subfolder not in data_store:
-        return go.Figure(), go.Figure(), go.Figure(layout=dict(autosize=True, width=None, height=300))#, go.Figure()
+        print("Not found")
+        return go.Figure(), go.Figure(), go.Figure(layout=dict(autosize=True, width=None, height=300)), labels#, go.Figure()
 
     wnd_action_trace = data_store[selected_subfolder].get('wnd_action_trace', pd.DataFrame())
     all_action_trace = data_store[selected_subfolder].get('all_action_trace', [])
@@ -314,11 +319,14 @@ def update_graph(selected_time, selected_variable, backgroundDivert, RequiredCer
     # fig4 = viz.timeline(fig4, filtered_all_action_trace, selected_time, start_date, end_date)
     # fig4['layout']['uirevision'] = 'Hello world!'
 
-    return fig2, fig1, fig3#, fig4
+    return fig2, fig1, fig3, labels#, fig4
     
 # Run the app
 if __name__ == '__main__':
 
+    subfolder_labels, data_store = parse_all_data("Results")
+    labels = list(data_store[list(data_store.keys())[0]]['aircraft_data'][list(data_store[list(data_store.keys())[0]]['aircraft_data'].keys())[0]].columns.tolist())  # Extracting column names for the first aircraft-specific dataframe
+    print(subfolder_labels)
     # webbrowser.open_new("http://127.0.0.1:8050/")
     # app.run_server(debug=True)
     app.run_server(debug=True, host='0.0.0.0', port=7860)

bash_scopy.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Source folder (replace with your actual source folder path)
+SOURCE_FOLDER="Results/"
+
+# Destination folder (replace with your actual destination folder path)
+DEST_FOLDER="Simple_results"
+
+# List of specific file names to copy (replace these with the actual file names)
+FILES_TO_COPY=("actionTrace_Agent_PIC Blaze.csv" "GCCRaven_acstate.csv" "SNLBlaze_acstate.csv")
+
+# Create the destination folder if it doesn't exist
+mkdir -p "$DEST_FOLDER"
+
+# Loop through each subfolder in the source folder
+for SUBFOLDER in "$SOURCE_FOLDER"/*; do
+    if [ -d "$SUBFOLDER" ]; then
+        # Get the name of the subfolder
+        SUBFOLDER_NAME=$(basename "$SUBFOLDER")
+        
+        # Create a corresponding subfolder in the destination folder
+        mkdir -p "$DEST_FOLDER/$SUBFOLDER_NAME"
+
+        # Copy the specific files if they exist in the subfolder
+        for FILENAME in "${FILES_TO_COPY[@]}"; do
+            SOURCE_FILE="$SUBFOLDER/$FILENAME"
+            if [ -f "$SOURCE_FILE" ]; then
+                cp "$SOURCE_FILE" "$DEST_FOLDER/$SUBFOLDER_NAME"
+            else
+                echo "File $FILENAME not found in $SUBFOLDER"
+            fi
+        done
+    fi
+done
+
+echo "Done! Specified files have been copied to the destination folder."

src/viz.py

@@ -11,10 +11,10 @@ class Visualizer:
 
     def wnd_visualization(figure_handle, dataframe, current_time, start_time = 0, end_time = 10^6):
         # Diagonal line y=x
-        figure_handle.add_trace(go.Scatter(x=[start_time, end_time], y=[start_time, end_time], mode='lines', line=dict(color='black', dash='dash')))
+        figure_handle.add_trace(go.Scatter(x=[start_time, end_time], y=[start_time, end_time], mode='lines', line=dict(color='black', dash='dash'), showlegend=False))
 
         # Dotted lines from the point to axes
-        figure_handle.add_trace(go.Scatter(x=[current_time, current_time, start_time], y=[start_time, current_time, current_time], mode='lines', line=dict(color='black', dash='dot')))
+        figure_handle.add_trace(go.Scatter(x=[current_time, current_time, start_time], y=[start_time, current_time, current_time], mode='lines', line=dict(color='black', dash='dot'), showlegend=False))
 
         # Adding scatter points with hover text
         hover_text = [f"Time: {time}<br>Action: {name}" for time, name in dataframe[['time', 'actionName']].values]
@@ -24,7 +24,8 @@ class Visualizer:
             mode='markers',
             marker=dict(color='black', size=15),
             text=hover_text,
-            hoverinfo='text'
+            hoverinfo='text',
+            name='Action'
         ))
 
         timestamps_and_ids_dict = {}
@@ -210,7 +211,7 @@ class Visualizer:
                 lon=filtered_xdata,
                 lat=filtered_ydata,
                 line=dict(width=2, color=colors[color_index]),
-                name=ac_name
+                name=ac_name + " Flight Path"
             ))
 
             if len(filtered_xdata) > 0 and len(filtered_ydata) > 0: