scemama/StageYann
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' of git.irsamc.ups-tlse.fr:scemama/StageYann

Browse Source
This commit is contained in:
Yann Damour 2020-04-30 11:08:08 +02:00
commit 4d456be51a
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Work.ipynb
View File

@ -1416,9 +1416,18 @@
"\n",
"let m_Phi = m_C;;\n",
"\n",
"type iteration = \n",
"{ coef : Mat.t ;\n",
" loc : float ;\n",
"}\n",
"\n",
"\n",
"(* Calcul de la nouvelle matrice Phi après rotations *)\n",
"let rec new_Phi m_Phi n = \n",
"let rec new_Phi prev_iter n = \n",
"\n",
" if n == 0 then\n",
" m_Phi\n",
" else\n",
"\n",
" (* Calcul de tous les alpha -> Matrice *)\n",
" let m_alpha m_C =\n",
@ -1506,9 +1515,19 @@
" in\n",
" Mat.sub m_C m_Psi\n",
" in\n",
" Mat.add m_Psi_tilde m_interm\n",
" \n",
" let coef = Mat.add m_Psi_tilde m_interm in\n",
" let loc = .... in\n",
" let result = \n",
" { coef ; loc }\n",
" in\n",
" if loc - prev_iter.loc < 1.e-5 then\n",
" result\n",
" else\n",
" new_Phi result (n-1)\n",
"in\n",
"if n > 0 then new_Phi m_Phi_tilde (n-1);;\n",
"(*-----*)\n",
"new_Phi m_C 10;;\n",
"\n",
"\n",
"\n"