Skip to content
This repository was archived by the owner on Nov 23, 2023. It is now read-only.

Commit 2c6e6dd

Browse files
rogereorogereo
committed
2 parents 9c76c56 + b1f8a25 commit 2c6e6dd

File tree

12 files changed

+39439
-435
lines changed

12 files changed

+39439
-435
lines changed

‎.DS_Store‎

8 KB
Binary file not shown.

‎Provisional Base Model/df_test.csv‎

Lines changed: 2924 additions & 0 deletions
Large diffs are not rendered by default.

‎Provisional Base Model/df_train.csv‎

Lines changed: 8767 additions & 0 deletions
Large diffs are not rendered by default.

‎Provisional Base Model/submission.csv‎

Lines changed: 2924 additions & 0 deletions
Large diffs are not rendered by default.

‎Team_GM5_BaseModel/Team_GM5_BaseModel.ipynb‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,11 @@
8484
},
8585
{
8686
"cell_type": "code",
87+
<<<<<<< HEAD
8788
"execution_count": 2,
89+
=======
90+
"execution_count": 1,
91+
>>>>>>> b1f8a257a6cd49cd653400723e3d953fdd83032f
8892
"id": "a54a43e1",
8993
"metadata": {
9094
"ExecuteTime": {
@@ -133,7 +137,11 @@
133137
},
134138
{
135139
"cell_type": "code",
140+
<<<<<<< HEAD
136141
"execution_count": 3,
142+
=======
143+
"execution_count": 2,
144+
>>>>>>> b1f8a257a6cd49cd653400723e3d953fdd83032f
137145
"id": "c3885458",
138146
"metadata": {
139147
"ExecuteTime": {
@@ -1386,7 +1394,11 @@
13861394
"name": "stderr",
13871395
"output_type": "stream",
13881396
"text": [
1397+
<<<<<<< HEAD
13891398
"C:\\Users\\Roger Arendse\\AppData\\Local\\Temp\\ipykernel_4920\\296457212.py:1: FutureWarning: Dropping of nuisance columns in DataFrame reductions (with 'numeric_only=None') is deprecated; in a future version this will raise TypeError. Select only valid columns before calling the reduction.\n",
1399+
=======
1400+
"C:\\Users\\Roger Arendse\\AppData\\Local\\Temp\\ipykernel_16368\\296457212.py:1: FutureWarning: Dropping of nuisance columns in DataFrame reductions (with 'numeric_only=None') is deprecated; in a future version this will raise TypeError. Select only valid columns before calling the reduction.\n",
1401+
>>>>>>> b1f8a257a6cd49cd653400723e3d953fdd83032f
13901402
" train_data.kurtosis().plot()\n"
13911403
]
13921404
},
@@ -1435,7 +1447,11 @@
14351447
"name": "stderr",
14361448
"output_type": "stream",
14371449
"text": [
1450+
<<<<<<< HEAD
14381451
"C:\\Users\\Roger Arendse\\AppData\\Local\\Temp\\ipykernel_4920\\1539948712.py:2: FutureWarning: Dropping of nuisance columns in DataFrame reductions (with 'numeric_only=None') is deprecated; in a future version this will raise TypeError. Select only valid columns before calling the reduction.\n",
1452+
=======
1453+
"C:\\Users\\Roger Arendse\\AppData\\Local\\Temp\\ipykernel_16368\\1539948712.py:2: FutureWarning: Dropping of nuisance columns in DataFrame reductions (with 'numeric_only=None') is deprecated; in a future version this will raise TypeError. Select only valid columns before calling the reduction.\n",
1454+
>>>>>>> b1f8a257a6cd49cd653400723e3d953fdd83032f
14391455
" train_data.skew(axis=0, skipna=True).plot()\n"
14401456
]
14411457
},
@@ -1477,7 +1493,11 @@
14771493
"name": "stderr",
14781494
"output_type": "stream",
14791495
"text": [
1496+
<<<<<<< HEAD
14801497
"C:\\Users\\Roger Arendse\\AppData\\Local\\Temp\\ipykernel_4920\\2564673981.py:1: FutureWarning: Dropping of nuisance columns in DataFrame reductions (with 'numeric_only=None') is deprecated; in a future version this will raise TypeError. Select only valid columns before calling the reduction.\n",
1498+
=======
1499+
"C:\\Users\\Roger Arendse\\AppData\\Local\\Temp\\ipykernel_16368\\2564673981.py:1: FutureWarning: Dropping of nuisance columns in DataFrame reductions (with 'numeric_only=None') is deprecated; in a future version this will raise TypeError. Select only valid columns before calling the reduction.\n",
1500+
>>>>>>> b1f8a257a6cd49cd653400723e3d953fdd83032f
14811501
" train_data.skew()\n"
14821502
]
14831503
},
@@ -3428,8 +3448,13 @@
34283448
"name": "stdout",
34293449
"output_type": "stream",
34303450
"text": [
3451+
<<<<<<< HEAD
34313452
"MSE: 4779.613766374662\n",
34323453
"r2: 0.18683350358747208\n"
3454+
=======
3455+
"MSE: 4660.745316656458\n",
3456+
"r2: 0.17701990440801418\n"
3457+
>>>>>>> b1f8a257a6cd49cd653400723e3d953fdd83032f
34333458
]
34343459
}
34353460
],
@@ -3580,6 +3605,7 @@
35803605
" <tbody>\n",
35813606
" <tr>\n",
35823607
" <th>0</th>\n",
3608+
<<<<<<< HEAD
35833609
" <td>8404.913541</td>\n",
35843610
" </tr>\n",
35853611
" <tr>\n",
@@ -3589,16 +3615,33 @@
35893615
" <tr>\n",
35903616
" <th>2</th>\n",
35913617
" <td>8611.320136</td>\n",
3618+
=======
3619+
" <td>7923.805886</td>\n",
3620+
" </tr>\n",
3621+
" <tr>\n",
3622+
" <th>1</th>\n",
3623+
" <td>7114.770178</td>\n",
3624+
" </tr>\n",
3625+
" <tr>\n",
3626+
" <th>2</th>\n",
3627+
" <td>8097.383796</td>\n",
3628+
>>>>>>> b1f8a257a6cd49cd653400723e3d953fdd83032f
35923629
" </tr>\n",
35933630
" </tbody>\n",
35943631
"</table>\n",
35953632
"</div>"
35963633
],
35973634
"text/plain": [
35983635
" load_shortfall_3h\n",
3636+
<<<<<<< HEAD
35993637
"0 8404.913541\n",
36003638
"1 7664.042458\n",
36013639
"2 8611.320136"
3640+
=======
3641+
"0 7923.805886\n",
3642+
"1 7114.770178\n",
3643+
"2 8097.383796"
3644+
>>>>>>> b1f8a257a6cd49cd653400723e3d953fdd83032f
36023645
]
36033646
},
36043647
"execution_count": 57,
@@ -3679,27 +3722,45 @@
36793722
" <tr>\n",
36803723
" <th>0</th>\n",
36813724
" <td>2018-01-01 00:00:00</td>\n",
3725+
<<<<<<< HEAD
36823726
" <td>8404.913541</td>\n",
3727+
=======
3728+
" <td>7923.805886</td>\n",
3729+
>>>>>>> b1f8a257a6cd49cd653400723e3d953fdd83032f
36833730
" </tr>\n",
36843731
" <tr>\n",
36853732
" <th>1</th>\n",
36863733
" <td>2018-01-01 03:00:00</td>\n",
3734+
<<<<<<< HEAD
36873735
" <td>7664.042458</td>\n",
3736+
=======
3737+
" <td>7114.770178</td>\n",
3738+
>>>>>>> b1f8a257a6cd49cd653400723e3d953fdd83032f
36883739
" </tr>\n",
36893740
" <tr>\n",
36903741
" <th>2</th>\n",
36913742
" <td>2018-01-01 06:00:00</td>\n",
3743+
<<<<<<< HEAD
36923744
" <td>8611.320136</td>\n",
3745+
=======
3746+
" <td>8097.383796</td>\n",
3747+
>>>>>>> b1f8a257a6cd49cd653400723e3d953fdd83032f
36933748
" </tr>\n",
36943749
" </tbody>\n",
36953750
"</table>\n",
36963751
"</div>"
36973752
],
36983753
"text/plain": [
36993754
" time load_shortfall_3h\n",
3755+
<<<<<<< HEAD
37003756
"0 2018-01-01 00:00:00 8404.913541\n",
37013757
"1 2018-01-01 03:00:00 7664.042458\n",
37023758
"2 2018-01-01 06:00:00 8611.320136"
3759+
=======
3760+
"0 2018-01-01 00:00:00 7923.805886\n",
3761+
"1 2018-01-01 03:00:00 7114.770178\n",
3762+
"2 2018-01-01 06:00:00 8097.383796"
3763+
>>>>>>> b1f8a257a6cd49cd653400723e3d953fdd83032f
37033764
]
37043765
},
37053766
"execution_count": 60,
@@ -3732,7 +3793,11 @@
37323793
},
37333794
{
37343795
"cell_type": "code",
3796+
<<<<<<< HEAD
37353797
"execution_count": 64,
3798+
=======
3799+
"execution_count": 61,
3800+
>>>>>>> b1f8a257a6cd49cd653400723e3d953fdd83032f
37363801
"id": "5e05db54",
37373802
"metadata": {},
37383803
"outputs": [],
@@ -3754,7 +3819,11 @@
37543819
},
37553820
{
37563821
"cell_type": "code",
3822+
<<<<<<< HEAD
37573823
"execution_count": 65,
3824+
=======
3825+
"execution_count": 62,
3826+
>>>>>>> b1f8a257a6cd49cd653400723e3d953fdd83032f
37583827
"id": "3ef5e25b",
37593828
"metadata": {},
37603829
"outputs": [],
@@ -3763,6 +3832,7 @@
37633832
"with open(model_load_path,'rb') as file:\n",
37643833
" unpickled_model = pickle.load(file)"
37653834
]
3835+
<<<<<<< HEAD
37663836
},
37673837
{
37683838
"cell_type": "code",
@@ -3771,6 +3841,8 @@
37713841
"metadata": {},
37723842
"outputs": [],
37733843
"source": []
3844+
=======
3845+
>>>>>>> b1f8a257a6cd49cd653400723e3d953fdd83032f
37743846
}
37753847
],
37763848
"metadata": {

0 commit comments

Comments
 (0)