Merge branch 'develop' into documentation

This commit is contained in:
fjosw 2023-07-19 11:13:42 +00:00
commit 9a186d6c30
3 changed files with 76 additions and 46 deletions

View file

@ -7,8 +7,7 @@
"outputs": [],
"source": [
"import pyerrors as pe\n",
"import numpy as np\n",
"import scipy"
"import numpy as np"
]
},
{
@ -27,8 +26,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"[[Obs[4.10(20)] Obs[-1.00(10)]]\n",
" [Obs[-1.00(10)] Obs[1.000(10)]]]\n"
"[[4.10(20) -1.00(10)]\n",
" [-1.00(10) 1.000(10)]]\n"
]
}
],
@ -63,8 +62,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"[[Obs[17.81] Obs[-5.1]]\n",
" [Obs[-5.1] Obs[2.0]]]\n"
"[[17.81 -5.1]\n",
" [-5.1 2.0]]\n"
]
}
],
@ -88,8 +87,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"[[Obs[4.1] Obs[-1.0]]\n",
" [Obs[-1.0] Obs[1.0]]]\n"
"[[4.1 -1.0]\n",
" [-1.0 1.0]]\n"
]
}
],
@ -113,8 +112,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"[[Obs[78.12099999999998] Obs[-22.909999999999997]]\n",
" [Obs[-22.909999999999997] Obs[7.1]]]\n"
"[[78.12099999999998 -22.909999999999997]\n",
" [-22.909999999999997 7.1]]\n"
]
}
],
@ -138,8 +137,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"[[Obs[30.161857460980094] Obs[-1.1752011936438014]]\n",
" [Obs[-1.1752011936438014] Obs[1.1752011936438014]]]\n"
"[[30.16185746098009 -1.1752011936438014]\n",
" [-1.1752011936438014 1.1752011936438014]]\n"
]
}
],
@ -163,7 +162,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"[Obs[2.00(40)] Obs[1.00(10)]]\n"
"[2.00(40) 1.00(10)]\n"
]
}
],
@ -171,8 +170,7 @@
"vec1 = pe.pseudo_Obs(2, 0.4, 'e1')\n",
"vec2 = pe.pseudo_Obs(1, 0.1, 'e1')\n",
"vector = np.asarray([vec1, vec2])\n",
"for (i), entry in np.ndenumerate(vector):\n",
" entry.gamma_method()\n",
"pe.gm(vector)\n",
"print(vector)"
]
},
@ -192,14 +190,13 @@
"name": "stdout",
"output_type": "stream",
"text": [
"[Obs[7.2(1.7)] Obs[-1.00(46)]]\n"
"[7.2(1.7) -1.00(45)]\n"
]
}
],
"source": [
"product = matrix @ vector\n",
"for (i), entry in np.ndenumerate(product):\n",
" entry.gamma_method()\n",
"pe.gm(product)\n",
"print(product)"
]
},
@ -245,15 +242,14 @@
"name": "stdout",
"output_type": "stream",
"text": [
"[[Obs[2.025(49)] Obs[0.0]]\n",
" [Obs[-0.494(50)] Obs[0.870(29)]]]\n"
"[[2.025(49) 0.0]\n",
" [-0.494(50) 0.870(29)]]\n"
]
}
],
"source": [
"cholesky = pe.linalg.cholesky(matrix)\n",
"for (i, j), entry in np.ndenumerate(cholesky):\n",
" entry.gamma_method()\n",
"pe.gm(cholesky)\n",
"print(cholesky)"
]
},
@ -273,8 +269,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"[[Obs[-8.881784197001252e-16] Obs[0.0]]\n",
" [Obs[0.0] Obs[0.0]]]\n"
"[[-8.881784197001252e-16 0.0]\n",
" [0.0 0.0]]\n"
]
}
],
@ -299,18 +295,17 @@
"name": "stdout",
"output_type": "stream",
"text": [
"[[Obs[0.494(12)] Obs[0.0]]\n",
" [Obs[0.280(40)] Obs[1.150(39)]]]\n",
"[[0.494(12) 0.0]\n",
" [0.280(40) 1.150(38)]]\n",
"Check:\n",
"[[Obs[1.0] Obs[0.0]]\n",
" [Obs[0.0] Obs[1.0]]]\n"
"[[1.0 0.0]\n",
" [0.0 1.0]]\n"
]
}
],
"source": [
"inv = pe.linalg.inv(cholesky)\n",
"for (i, j), entry in np.ndenumerate(inv):\n",
" entry.gamma_method()\n",
"pe.gm(inv)\n",
"print(inv)\n",
"print('Check:')\n",
"check_inv = cholesky @ inv\n",
@ -335,21 +330,19 @@
"output_type": "stream",
"text": [
"Eigenvalues:\n",
"[Obs[0.705(57)] Obs[4.39(19)]]\n",
"[0.705(56) 4.39(20)]\n",
"Eigenvectors:\n",
"[[Obs[-0.283(26)] Obs[-0.9592(75)]]\n",
" [Obs[-0.9592(75)] Obs[0.283(26)]]]\n"
"[[-0.283(26) -0.9592(75)]\n",
" [-0.9592(75) 0.283(26)]]\n"
]
}
],
"source": [
"e, v = pe.linalg.eigh(matrix)\n",
"for (i), entry in np.ndenumerate(e):\n",
" entry.gamma_method()\n",
"pe.gm(e)\n",
"print('Eigenvalues:')\n",
"print(e)\n",
"for (i, j), entry in np.ndenumerate(v):\n",
" entry.gamma_method()\n",
"pe.gm(v)\n",
"print('Eigenvectors:')\n",
"print(v)"
]
@ -371,9 +364,9 @@
"output_type": "stream",
"text": [
"Check eigenvector 1\n",
"[Obs[-5.551115123125783e-17] Obs[0.0]]\n",
"[-5.551115123125783e-17 0.0]\n",
"Check eigenvector 2\n",
"[Obs[0.0] Obs[-2.220446049250313e-16]]\n"
"[0.0 -2.220446049250313e-16]\n"
]
}
],
@ -407,7 +400,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.10"
"version": "3.11.0"
}
},
"nbformat": 4,