From 10d3830cfab02451991060a3aba2136b0d31cde1 Mon Sep 17 00:00:00 2001
From: "Valo Saaristo (TAU)" <valo.saaristo@tuni.fi>
Date: Mon, 9 Dec 2024 15:07:20 +0200
Subject: [PATCH 1/2] removed errors from numpy and pandas

---
 .DS_Store                        | Bin 6148 -> 0 bytes
 EDA-Artifact-Detection-Script.py |  10 +++++-----
 load_files.py                    |  16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

diff --git a/EDA-Artifact-Detection-Script.py b/EDA-Artifact-Detection-Script.py
index 13f0432..e77fc3b 100755
--- a/EDA-Artifact-Detection-Script.py
+++ b/EDA-Artifact-Detection-Script.py
@@ -11,7 +11,7 @@
 
 matplotlib.rcParams['ps.useafm'] = True
 matplotlib.rcParams['pdf.use14corefonts'] = True
-matplotlib.rcParams['text.usetex'] = True
+matplotlib.rcParams['text.usetex'] = False
 
 
 def getWaveletData(data):
@@ -29,7 +29,7 @@ def getWaveletData(data):
 
     # Create wavelet dataframes
     oneSecond = pd.date_range(start=startTime, periods=len(data), freq='1s')
-    halfSecond = pd.date_range(start=startTime, periods=len(data), freq='500L')
+    halfSecond = pd.date_range(start=startTime, periods=len(data), freq='500ms')
 
     # Compute wavelets
     cA_n, cD_3, cD_2, cD_1 = pywt.wavedec(data['EDA'], 'Haar', level=3) #3 = 1Hz, 2 = 2Hz, 1=4Hz
@@ -109,10 +109,10 @@ def getFeatures(data,w1,wH):
 
     all_feat = np.hstack([statFeat,waveletFeat])
     
-    if np.Inf in all_feat:
+    if np.inf in all_feat:
         print("Inf")
     
-    if np.NaN in all_feat:
+    if np.nan in all_feat:
         print("NaN")
 
     return list(all_feat)
@@ -308,7 +308,7 @@ def plotData(data,labels,classifierList,filteredPlot=0,secondsPlot=0):
             plt.legend(['Raw SC','Filtered SC'],loc=0)
 
         # Label and Title each subplot
-        plt.ylabel('$\mu$S')
+        plt.ylabel(chr(956) + "S")
         plt.title(key)
     
     # Only include x axis label on final subplot
diff --git a/load_files.py b/load_files.py
index 789a296..da8a41f 100644
--- a/load_files.py
+++ b/load_files.py
@@ -99,7 +99,7 @@ def _loadSingleFile_E4(filepath,list_of_columns, expected_sample_rate,freq):
     
     # Get the startTime and sample rate
     startTime = pd.to_datetime(float(data.columns.values[0]),unit="s")
-    sampleRate = float(data.iloc[0][0])
+    sampleRate = float(data.iloc[0].iloc[0])
     data = data[data.index!=0]
     data.index = data.index-1
     
@@ -116,17 +116,17 @@ def _loadSingleFile_E4(filepath,list_of_columns, expected_sample_rate,freq):
 
 def loadData_E4(filepath):
     # Load EDA data
-    eda_data = _loadSingleFile_E4(os.path.join(filepath,'EDA.csv'),["EDA"],4,"250L")
+    eda_data = _loadSingleFile_E4(os.path.join(filepath,'EDA.csv'),["EDA"],4,"250ms")
     # Get the filtered data using a low-pass butterworth filter (cutoff:1hz, fs:8hz, order:6)
     eda_data['filtered_eda'] =  butter_lowpass_filter(eda_data['EDA'], 1.0, 8, 6)
 
     # Load ACC data
-    acc_data = _loadSingleFile_E4(os.path.join(filepath,'ACC.csv'),["AccelX","AccelY","AccelZ"],32,"31250U")
+    acc_data = _loadSingleFile_E4(os.path.join(filepath,'ACC.csv'),["AccelX","AccelY","AccelZ"],32,"31250us")
     # Scale the accelometer to +-2g
     acc_data[["AccelX","AccelY","AccelZ"]] = acc_data[["AccelX","AccelY","AccelZ"]]/64.0
 
     # Load Temperature data
-    temperature_data = _loadSingleFile_E4(os.path.join(filepath,'TEMP.csv'),["Temp"],4,"250L")
+    temperature_data = _loadSingleFile_E4(os.path.join(filepath,'TEMP.csv'),["Temp"],4,"250ms")
     
     data = eda_data.join(acc_data, how='outer')
     data = data.join(temperature_data, how='outer')
@@ -229,17 +229,17 @@ def interpolateDataTo8Hz(data,sample_rate,startTime):
     if sample_rate<8:
         # Upsample by linear interpolation
         if sample_rate==2:
-            data.index = pd.date_range(start=startTime, periods=len(data), freq='500L')
+            data.index = pd.date_range(start=startTime, periods=len(data), freq='500ms')
         elif sample_rate==4:
-            data.index = pd.date_range(start=startTime, periods=len(data), freq='250L')
-        data = data.resample("125L").mean()
+            data.index = pd.date_range(start=startTime, periods=len(data), freq='250ms')
+        data = data.resample("125ms").mean()
     else:
         if sample_rate>8:
             # Downsample
             idx_range = list(range(0,len(data))) # TODO: double check this one
             data = data.iloc[idx_range[0::int(int(sample_rate)/8)]]
         # Set the index to be 8Hz
-        data.index = pd.date_range(start=startTime, periods=len(data), freq='125L')
+        data.index = pd.date_range(start=startTime, periods=len(data), freq='125ms')
 
     # Interpolate all empty values
     data = interpolateEmptyValues(data)

From 254026f899ae22f3818c35338a2df45cd0366cd1 Mon Sep 17 00:00:00 2001
From: "Valo Saaristo (TAU)" <valo.saaristo@tuni.fi>
Date: Mon, 9 Dec 2024 15:11:05 +0200
Subject: [PATCH 2/2] updated requirements.txt

---
 requirements.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 8ba778e..e463dff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
-numpy==1.16.2
-scipy==1.2.1
-pandas==0.24.1
-scikit-learn==0.20.3
-matplotlib>=2.1.2
-PyWavelets==1.0.2
\ No newline at end of file
+numpy==2.2.0
+scipy==1.14.1
+pandas==2.2.3
+scikit-learn==1.5.2
+matplotlib>=3.9.3
+PyWavelets==1.8.0
\ No newline at end of file