Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
4cbda9c
minor changes
restrepo Feb 21, 2018
1d8c062
Pandas
restrepo Feb 21, 2018
171d711
Pandas
restrepo Feb 21, 2018
2379473
mc
restrepo Feb 23, 2018
89736bf
lc
restrepo Feb 23, 2018
f2d33ba
scipy usage
restrepo Feb 28, 2018
dc62397
Today changes
restrepo Feb 28, 2018
5a64a98
Eviando tareas
restrepo Mar 2, 2018
a0b52ec
Tarea de conversión de binario-base10
cdavidgutierrez Mar 2, 2018
cb52b9c
Tarea 1
Mar 2, 2018
94f7729
mp
restrepo Mar 2, 2018
4290cbb
Merge remote-tracking branch 'upstream/master'
cdavidgutierrez Mar 6, 2018
a296aba
Tarea de etodo e punto fijo
cdavidgutierrez Mar 6, 2018
6e0854c
lc
restrepo Mar 7, 2018
c9e8898
Merge pull request #4 from mleguizamonp/master
restrepo Mar 7, 2018
407f79b
Merge pull request #3 from cdavidgutierrez/master
restrepo Mar 7, 2018
fa6d57d
clean repo
restrepo Mar 7, 2018
3d8ee79
Create HOMEWORK.csv
restrepo Mar 7, 2018
e4280a8
Update HOMEWORK.csv
restrepo Mar 7, 2018
c225b2b
clean files
restrepo Mar 7, 2018
11ef48e
ch
restrepo Mar 9, 2018
67af29e
Tarea 1 nùmeros binarios
Mar 12, 2018
9f941f2
Merge pull request #6 from nataliaalvarezb/master
restrepo Mar 12, 2018
51311cc
Update HOMEWORK.csv
restrepo Mar 12, 2018
1f00c72
Tarea 2 Punto Fijo
Mar 13, 2018
975ba3a
Tarea 3 Ajuste
Mar 13, 2018
febe913
Merge pull request #7 from nataliaalvarezb/master
restrepo Mar 13, 2018
f8b70e4
Update HOMEWORK.csv
restrepo Mar 13, 2018
901eef4
Update HOMEWORK.csv
restrepo Mar 13, 2018
cef4183
least action
restrepo Mar 14, 2018
0b32bf9
least action
restrepo Mar 14, 2018
efe3b43
Tarea 2
Mar 15, 2018
72ccaa7
Merge pull request #8 from EusseJhoan/master
restrepo Mar 15, 2018
f99819a
Tarea 3
Mar 16, 2018
2623369
New material
restrepo Mar 16, 2018
508259a
Derivative
restrepo Mar 16, 2018
7e899c2
Tarea interpolacion de puntos escogidos
cdavidgutierrez Mar 16, 2018
4903bda
fix function
restrepo Mar 16, 2018
a21b2a7
Merge pull request #9 from EusseJhoan/master
restrepo Mar 16, 2018
d1e9770
lc
restrepo Mar 16, 2018
f3dcfd9
Update HOMEWORK.csv
restrepo Mar 16, 2018
3a56493
Update HOMEWORK.csv
restrepo Mar 16, 2018
8457764
Update HOMEWORK.csv
restrepo Mar 16, 2018
2ab0acf
example
restrepo Mar 21, 2018
e32fe15
Merge remote-tracking branch 'upstream/master'
cdavidgutierrez Mar 21, 2018
51d54ca
Tarea2 3
Mar 21, 2018
36ecdc5
Merge pull request #11 from mleguizamonp/master
restrepo Mar 21, 2018
0ff81cc
Tarea 4
Mar 23, 2018
29ea72b
Tarea4
Mar 23, 2018
5dccd8b
hh
restrepo Mar 23, 2018
d3755a0
hh
restrepo Mar 23, 2018
2d7b745
hh
restrepo Mar 23, 2018
cbd8bb7
Merge remote-tracking branch 'upstream/master'
cdavidgutierrez Mar 23, 2018
1caa1cc
Examen1
Mar 23, 2018
e013672
Examen 1
Mar 23, 2018
1c6f361
examen 1
cdavidgutierrez Mar 23, 2018
b660fa1
Merge pull request #13 from mleguizamonp/master
restrepo Mar 23, 2018
fb15468
Merge pull request #12 from EusseJhoan/master
restrepo Mar 23, 2018
4fa787d
hh
restrepo Mar 23, 2018
a189fb3
numpy vectorize
restrepo Mar 23, 2018
18e41ff
Update HOMEWORK.csv
restrepo Mar 23, 2018
1d1c4d7
Update HOMEWORK.csv
restrepo Mar 23, 2018
0a54513
solucion
restrepo Mar 23, 2018
ba38f43
solucion
restrepo Mar 23, 2018
bbbf7aa
Merge pull request #16 from cdavidgutierrez/master
restrepo Mar 23, 2018
7d7959f
Merge pull request #15 from EusseJhoan/master
restrepo Mar 23, 2018
9537a16
Merge pull request #14 from mleguizamonp/master
restrepo Mar 23, 2018
408960c
Split numerical calculus
restrepo Mar 23, 2018
8f009cb
Rename Examen-01_2018_1_1032478036.ipynb to Examen-2018_1_01_10324780…
restrepo Apr 4, 2018
0b50590
Rename Examen-2018_1_01_1032478036.ipynb to Examen_2018_1_01_10324780…
restrepo Apr 4, 2018
1a58109
Rename Examen_01_2018_1_1038414799.ipynb to Examen_2018_1_01_10384147…
restrepo Apr 4, 2018
177e9e3
Create exams.csv
restrepo Apr 4, 2018
71a0bbd
poly
restrepo Apr 6, 2018
7358acb
poly
restrepo Apr 6, 2018
d75894b
poly
restrepo Apr 6, 2018
63b062b
poly
restrepo Apr 6, 2018
35b29da
poly
restrepo Apr 6, 2018
85de6da
poly
restrepo Apr 6, 2018
681747c
poly
restrepo Apr 6, 2018
8a2e58c
missing files
restrepo Apr 9, 2018
9e232fe
Tarea5
Apr 10, 2018
c8cc7bf
Merge pull request #19 from mleguizamonp/master
restrepo Apr 11, 2018
b62e5d7
Int
restrepo Apr 11, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
432,004 changes: 0 additions & 432,004 deletions data/FOF.dat

This file was deleted.

242,863 changes: 0 additions & 242,863 deletions data/SPH_gas.dat

This file was deleted.

286 changes: 286 additions & 0 deletions exams/Examen_2018_1_01_1032478036.ipynb

Large diffs are not rendered by default.

209 changes: 209 additions & 0 deletions exams/Examen_2018_1_01_1038414799.ipynb

Large diffs are not rendered by default.

247 changes: 247 additions & 0 deletions exams/Examen_2018_1_01_1216730080.ipynb

Large diffs are not rendered by default.

80 changes: 80 additions & 0 deletions exams/Examen_2018_1_01_enunciado.ipynb
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"cells": [
{
"cell_type": "markdown",
"metadata": {},
"source": [
"## Primer Examen 10%\n",
"Un vehículo parte del reposo en un punto con una aceleración constante de $a_1$. 10 segundos después pasa por el mismo punto, y en la misma dirección, un segundo vehículo con una rapidez de 10 m/s y con aceleración constante $a_2$. Calcule el punto de encuentro: \n",
"1. Gráficamente \n",
"1. Encontrando las raíces del polinomio generado a partir de igualar las dos ecuaciones de movimiento.\n",
"1. Grafique el polinomio generado\n",
"\n",
"_Ayuda:_\n",
"La ecuación de movimiento para el movimiento uniformemente acelerado es:\n",
"\\begin{align}\n",
"x=x_0+v_0 (t-t_0)+\\tfrac{1}{2} a (t-t_0)^2\\,,\n",
"\\end{align}\n",
"donde\n",
"* $x_0$ es la posición inicial\n",
"* $v_0$ es la rapidez inicial\n",
"* $t_0$ es el tiempo inicial\n",
"\n",
"Ejecute la siguiente celda para fijar los valores de las aceleraciones en su caso"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"%pylab inline\n",
"import numpy as np\n",
"a1=np.random.choice([2,3,4])\n",
"a2=a1+4\n",
"print('a1={} m/s² and a2={} m/s²'.format(a1,a2))"
]
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.4.2"
},
"toc": {
"colors": {
"hover_highlight": "#DAA520",
"running_highlight": "#FF0000",
"selected_highlight": "#FFD700"
},
"moveMenuLeft": true,
"nav_menu": {
"height": "30px",
"width": "252px"
},
"navigate_menu": true,
"number_sections": true,
"sideBar": true,
"threshold": 4,
"toc_cell": false,
"toc_section_display": "block",
"toc_window_display": false
}
},
"nbformat": 4,
"nbformat_minor": 2
}
322 changes: 322 additions & 0 deletions exams/Examen_2018_1_01_solucion.ipynb

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions exams/exams.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Id.,Ex 1
1035441007,5
1032478036,5
1038414799,4.5
1216730080,4.5
Empty file added homework/.empty
Empty file.
5 changes: 5 additions & 0 deletions homework/HOMEWORK.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ID,T1,T2,T3,T4
1032478036,5,5,5,4.5
1035441007,5,5,5,0
1038414799,-,5,5,4.6
1216730080,5,5,-,0
116 changes: 116 additions & 0 deletions homework/Homework_2018_1_01_1032478036.ipynb
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
{
"cells": [
{
"cell_type": "markdown",
"metadata": {},
"source": [
"## Tarea\n",
"Escribir, utilizando funciones de numpy, un programa que tome un número en binario y devuelva el número correspondiente "
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"outputs": [],
"source": [
"import numpy as np"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"outputs": [],
"source": [
"def numtoBin(BIN):\n",
" import sys\n",
" if type(BIN)!=str:\n",
" sys.exit('Error, debe ingresar el número como un str')\n",
" else:\n",
" binn=np.array(list(BIN)) #Convierte el str en un arreglo\n",
" binn=binn.astype(int) #convierte cada entrada a entero\n",
" inv=binn[::-1] #invierte el arreglo\n",
" s=inv[-1] #toma la ultima posicion\n",
" pot=np.arange(1,24) #crea un arreglo con numeros del 1-23\n",
" pot2=np.arange(0,8) #crea un arreglo con numeros del 0-8\n",
" r=(-1)**int(s)*(1+np.dot(np.exp2(-pot),inv[23-pot]))*2**(np.dot(inv[23+pot2],np.exp2(pot2))-127)\n",
" print ('El numero binario: {}, corresponde a: {}'.format(BIN,r))\n",
" "
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"outputs": [],
"source": [
"numtoBin('00111110001000000000000000000000')"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"outputs": [],
"source": [
"def numtoBin2(BIN):\n",
" import sys\n",
" if type(BIN)!=str:\n",
" sys.exit('Error, debe ingresar el número como un str')\n",
" else:\n",
" binn=np.array(list(BIN)) #Convierte el str en un arreglo\n",
" binn=binn.astype(int) #convierte cada entrada a entero\n",
" inv=binn[::-1] #invierte el arreglo\n",
" s=inv[-1] #toma la ultima posicion\n",
" pot=np.arange(1,24) #crea un arreglo con numeros del 1-23\n",
" pot2=np.arange(0,8) #crea un arreglo con numeros del 0-8\n",
" frac= 1+np.sum(np.exp2(-pot)*inv[23-pot]) #crea un arreglo de potencias de 2, las multiplica por cada entrada de inv y las suma\n",
" exp=int(np.sum(inv[23+pot2]*np.exp2(pot2))) #toma como entero el valor de la suma de los arrglos\n",
" r= (-1)**int(s)*frac*2**(exp-127) #aplica la formula para recuperar el numero real\n",
" print ('El numero binario: {}, corresponde a: {}'.format(BIN,r))\n",
" "
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"outputs": [],
"source": [
"numtoBin2('00111110001000000000000000000000')"
]
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.4.2"
}
},
"nbformat": 4,
"nbformat_minor": 2
}
124 changes: 124 additions & 0 deletions homework/Homework_2018_1_02_1032478036.ipynb

Large diffs are not rendered by default.

122 changes: 122 additions & 0 deletions homework/Homework_2018_1_03_1032478036.ipynb

Large diffs are not rendered by default.

158 changes: 158 additions & 0 deletions homework/Homework_2018_1_04_1032478036.ipynb

Large diffs are not rendered by default.

Loading