nuluh/thesis
1
0
Fork 0
Code Issues 47 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix(notebook): correct execution counts and update file naming conventions for STFT processing

Browse Source 
Closes #27
This commit is contained in:
nuluh
2025-03-11 19:08:56 +07:00
parent fa6e1ff72b
commit b890e556cf
1 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
code/notebooks/stft.ipynb
View File

@@ -23,7 +23,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 3,
"metadata": {},
"outputs": [
{
@@ -32,7 +32,7 @@
"Index(['Time', 'Real'], dtype='object')"
]
},
"execution_count": 4,
"execution_count": 3,
"metadata": {},
"output_type": "execute_result"
}
@@ -271,7 +271,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": 7,
"metadata": {},
"outputs": [
{
@@ -363,7 +363,7 @@
" [262144 rows x 2 columns]]"
]
},
"execution_count": 6,
"execution_count": 7,
"metadata": {},
"output_type": "execute_result"
}
@@ -375,7 +375,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": 6,
"metadata": {},
"outputs": [
{
@@ -404,7 +404,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 7,
"metadata": {},
"outputs": [
{
@@ -457,7 +457,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": 19,
"metadata": {},
"outputs": [],
"source": [
@@ -483,7 +483,7 @@
" sensor_num = sensor_suffix[-1] # '1' or '2'\n",
" \n",
" # Construct the file path\n",
" file_name = f'D{damage_num}_TEST{test_num:02d}_{sensor_suffix}.csv'\n",
" file_name = f'DAMAGE_{damage_num}_TEST{test_num}_{sensor_suffix}.csv'\n",
" file_path = os.path.join(damage_base_path, f'DAMAGE_{damage_num}', file_name)\n",
" \n",
" # Check if the file exists\n",
@@ -517,7 +517,7 @@
" sensor_output_dir = os.path.join(damage_base_path, sensor_name.lower())\n",
" os.makedirs(sensor_output_dir, exist_ok=True)\n",
" stft_file_path = os.path.join(sensor_output_dir, stft_file_name)\n",
" \n",
" print(stft_file_path)\n",
" # Append the flattened STFT to the CSV\n",
" try:\n",
" flattened_stft_df = pd.DataFrame([flattened_stft])\n",
@@ -534,7 +534,7 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": 20,
"metadata": {},
"outputs": [
{
@@ -609,19 +609,19 @@
" (6, 5, '02')]"
]
},
"execution_count": 2,
"execution_count": 20,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"# Define the base path where DAMAGE_X folders are located\n",
"damage_base_path = 'D:/thesis/data/working/'\n",
"damage_base_path = 'D:/thesis/data/converted/raw/'\n",
"\n",
"# Define active sensors\n",
"active_sensors = {\n",
" '01': 'Sensor1', # Beginning map sensor\n",
" '02': 'Sensor2' # End map sensor\n",
" '01': 'sensor1', # Beginning map sensor\n",
" '02': 'sensor2' # End map sensor\n",
"}\n",
"\n",
"# Define damage cases and test runs\n",
@@ -648,23 +648,33 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Starting STFT processing with 8 CPU cores...\n"
"Starting sequential STFT processing...\n",
"D:/thesis/data/converted/raw/sensor1\\stft_data1_1.csv\n",
"Appended STFT data to D:/thesis/data/converted/raw/sensor1\\stft_data1_1.csv\n",
"Processed 1/60 files\n",
"D:/thesis/data/converted/raw/sensor2\\stft_data2_1.csv\n",
"Appended STFT data to D:/thesis/data/converted/raw/sensor2\\stft_data2_1.csv\n",
"Processed 2/60 files\n",
"D:/thesis/data/converted/raw/sensor1\\stft_data1_1.csv\n",
"Appended STFT data to D:/thesis/data/converted/raw/sensor1\\stft_data1_1.csv\n",
"Processed 3/60 files\n",
"D:/thesis/data/converted/raw/sensor2\\stft_data2_1.csv\n"
]
}
],
"source": [
"# Use multiprocessing Pool to process STFTs in parallel\n",
"# Process STFTs sequentially instead of in parallel\n",
"if __name__ == \"__main__\":\n",
" print(f\"Starting STFT processing with {os.cpu_count()} CPU cores...\")\n",
" with Pool(processes=os.cpu_count()) as pool:\n",
" for i, _ in enumerate(pool.imap_unordered(process_stft, args_list), 1):\n",
" print(f\"Starting sequential STFT processing...\")\n",
" for i, arg in enumerate(args_list, 1):\n",
" process_stft(arg)\n",
" print(f\"Processed {i}/{len(args_list)} files\")\n",
" print(\"STFT processing completed.\")"
]
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 11,
"metadata": {},
"outputs": [
{