From fa9b2b142abd8e5fd7bb5ec13c7dc211962dcef1 Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@irsamc.ups-tlse.fr>
Date: Thu, 30 Apr 2020 11:05:54 +0200
Subject: [PATCH] Iterations

---
 Work.ipynb | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/Work.ipynb b/Work.ipynb
index 0bfa62f..158b23f 100644
--- a/Work.ipynb
+++ b/Work.ipynb
@@ -1397,9 +1397,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",
@@ -1487,9 +1496,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"