Skip to content

Commit

Permalink
#47 Reestructurar reositorio y actualizaciones
Browse files Browse the repository at this point in the history 
Archivos pendientes de actualizar.
  • Loading branch information
@mecyc
mecyc committed Jan 12, 2023
1 parent 58aae06 commit e0f736e
Show file tree
Hide file tree
Showing 24 changed files with 3,310 additions and 31,421 deletions.
Binary file added iconos/icono.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
515 changes: 515 additions & 0 deletions scripts/.ipynb_checkpoints/Auto-Sklearn-checkpoint.ipynb
View file

Large diffs are not rendered by default.

168 changes: 77 additions & 91 deletions scripts/.ipynb_checkpoints/GenerarParticiones-checkpoint.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"cells": [
{
"cell_type": "code",
"execution_count": 119,
"execution_count": 1,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -13,7 +13,7 @@
},
{
"cell_type": "code",
"execution_count": 120,
"execution_count": 2,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -39,19 +39,28 @@
},
{
"cell_type": "code",
"execution_count": 121,
"execution_count": 3,
"metadata": {},
"outputs": [],
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"(300, 291)\n"
]
}
],
"source": [
"assert(len(get_data('Materiales\\C01_V01.npy').shape) == 2) #comprobar que devuelve un array 2D\n",
"assert(get_data('Materiales\\C01_V01.npy').shape[1] == 291) #comprobar que la segunda dimensión tiene tamaño 291\n",
"assert((get_data('Materiales\\C01_V01.npy').real.mean) != None) #comprobar que la matriz tiene una parte real\n",
"assert((get_data('Materiales\\C01_V01.npy').imag.mean) != None) #comprobar que la matriz tiene una parte imaginaria"
"assert((get_data('Materiales\\C01_V01.npy').imag.mean) != None) #comprobar que la matriz tiene una parte imaginaria\n",
"print(get_data('Materiales\\C01_V01.npy').shape)"
]
},
{
"cell_type": "code",
"execution_count": 122,
"execution_count": 4,
"metadata": {},
"outputs": [],
"source": [
Expand Down Expand Up @@ -81,7 +90,7 @@
},
{
"cell_type": "code",
"execution_count": 123,
"execution_count": 5,
"metadata": {},
"outputs": [
{
Expand All @@ -102,7 +111,7 @@
},
{
"cell_type": "code",
"execution_count": 124,
"execution_count": 6,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -116,79 +125,16 @@
},
{
"cell_type": "code",
"execution_count": 125,
"metadata": {},
"outputs": [
{
"ename": "NameError",
"evalue": "name 'modulo' is not defined",
"output_type": "error",
"traceback": [
"\u001b[1;31m---------------------------------------------------------------------------\u001b[0m",
"\u001b[1;31mNameError\u001b[0m Traceback (most recent call last)",
"\u001b[1;32m<ipython-input-125-76bab1df7580>\u001b[0m in \u001b[0;36m<module>\u001b[1;34m\u001b[0m\n\u001b[1;32m----> 1\u001b[1;33m \u001b[0mmodulo\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m",
"\u001b[1;31mNameError\u001b[0m: name 'modulo' is not defined"
]
}
],
"source": [
"modulo"
]
},
{
"cell_type": "code",
"execution_count": 126,
"metadata": {},
"outputs": [
{
"ename": "NameError",
"evalue": "name 'fase' is not defined",
"output_type": "error",
"traceback": [
"\u001b[1;31m---------------------------------------------------------------------------\u001b[0m",
"\u001b[1;31mNameError\u001b[0m Traceback (most recent call last)",
"\u001b[1;32m<ipython-input-126-90f36cf4887b>\u001b[0m in \u001b[0;36m<module>\u001b[1;34m\u001b[0m\n\u001b[1;32m----> 1\u001b[1;33m \u001b[0mfase\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mmin\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m",
"\u001b[1;31mNameError\u001b[0m: name 'fase' is not defined"
]
}
],
"source": [
"fase.min()"
]
},
{
"cell_type": "code",
"execution_count": 127,
"metadata": {},
"outputs": [
{
"ename": "NameError",
"evalue": "name 'fase' is not defined",
"output_type": "error",
"traceback": [
"\u001b[1;31m---------------------------------------------------------------------------\u001b[0m",
"\u001b[1;31mNameError\u001b[0m Traceback (most recent call last)",
"\u001b[1;32m<ipython-input-127-5eaca61668e3>\u001b[0m in \u001b[0;36m<module>\u001b[1;34m\u001b[0m\n\u001b[1;32m----> 1\u001b[1;33m \u001b[0mfase\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mmax\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m",
"\u001b[1;31mNameError\u001b[0m: name 'fase' is not defined"
]
}
],
"source": [
"fase.max()"
]
},
{
"cell_type": "code",
"execution_count": 128,
"execution_count": 7,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"65.85590330410783"
"35.6931365951495"
]
},
"execution_count": 128,
"execution_count": 7,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -199,16 +145,16 @@
},
{
"cell_type": "code",
"execution_count": 129,
"execution_count": 8,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"457.4374274149416"
"1465.3961921610141"
]
},
"execution_count": 129,
"execution_count": 8,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -219,7 +165,7 @@
},
{
"cell_type": "code",
"execution_count": 130,
"execution_count": 9,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -245,7 +191,7 @@
},
{
"cell_type": "code",
"execution_count": 146,
"execution_count": 10,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -256,7 +202,7 @@
},
{
"cell_type": "code",
"execution_count": 190,
"execution_count": 11,
"metadata": {},
"outputs": [],
"source": [
Expand Down Expand Up @@ -324,7 +270,7 @@
},
{
"cell_type": "code",
"execution_count": 216,
"execution_count": 12,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -354,7 +300,7 @@
},
{
"cell_type": "code",
"execution_count": 217,
"execution_count": 13,
"metadata": {},
"outputs": [
{
Expand All @@ -363,7 +309,7 @@
"(270, 30, 270, 30, 270, 30, 582)"
]
},
"execution_count": 217,
"execution_count": 13,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -374,7 +320,7 @@
},
{
"cell_type": "code",
"execution_count": 218,
"execution_count": 14,
"metadata": {},
"outputs": [
{
Expand All @@ -383,7 +329,7 @@
"(270, 582)"
]
},
"execution_count": 218,
"execution_count": 14,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -394,7 +340,7 @@
},
{
"cell_type": "code",
"execution_count": 219,
"execution_count": 15,
"metadata": {},
"outputs": [
{
Expand All @@ -403,7 +349,7 @@
"(30, 582)"
]
},
"execution_count": 219,
"execution_count": 15,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -414,7 +360,7 @@
},
{
"cell_type": "code",
"execution_count": 220,
"execution_count": 16,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -426,7 +372,7 @@
},
{
"cell_type": "code",
"execution_count": 221,
"execution_count": 17,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -436,10 +382,50 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 18,
"metadata": {},
"outputs": [],
"source": []
"source": [
"def conjunto_datos(materiales, objetos, vistas):\n",
" \n",
" part_datos = [] #todos los datos\n",
"\n",
" datos = [] #conjunto datos\n",
" for y in materiales: #Bucle de los materiales = 3\n",
" for i in objetos: #Bucle de los objetos = 10\n",
" #obj = [] #Lista de las vistas de un objeto\n",
" for j in vistas: #Bucle de las vistas = 10\n",
"\n",
" url = ('Materiales\\%s%s_V%s.npy' % (y,i,j))\n",
" data = get_data(url)\n",
" modulo_fase = get_modulo_fase(data)\n",
" media = get_media(modulo_fase)\n",
"\n",
" datos.append(media)\n",
"\n",
" part_datos = np.asarray(datos) \n",
"\n",
"\n",
" return part_datos"
]
},
{
"cell_type": "code",
"execution_count": 19,
"metadata": {},
"outputs": [],
"source": [
"datos = conjunto_datos(materiales, objetos, vistas)"
]
},
{
"cell_type": "code",
"execution_count": 20,
"metadata": {},
"outputs": [],
"source": [
"np.save('conjunto_datos.npy', datos)"
]
},
{
"cell_type": "code",
Expand Down
9 changes: 1 addition & 8 deletions scripts/.ipynb_checkpoints/GridSearchCV (SVM)-checkpoint.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,13 +407,6 @@
"source": [
"# -------------------------------------------------------------------------------"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand All @@ -432,7 +425,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.9"
"version": "3.7.4"
}
},
"nbformat": 4,
Expand Down
Loading

0 comments on commit e0f736e

Please sign in to comment.