update

Author: MartinPdeS

SuPyMode/Solver.py

@@ -63,29 +63,30 @@ def GetSuperSet(self,
                     ):
 
         CppSolver  = self.InitBinding(Symmetries, Wavelength, nMode, sMode)
-        CppSolver1  = self.InitBinding({'Right': -1, 'Left': 0, 'Top': 0, 'Bottom': 0}, Wavelength, nMode, sMode)
+        #CppSolver1  = self.InitBinding({'Right': -1, 'Left': 0, 'Top': 0, 'Bottom': 0}, Wavelength, nMode, sMode)
 
         self.ITRList = np.linspace(ITRi, ITRf, Nstep)
 
 
 
         CppSolver.LoopOverITR(ITR=self.ITRList, ExtrapolationOrder=3)
-        CppSolver1.LoopOverITR(ITR=self.ITRList, ExtrapolationOrder=3)
+        #CppSolver1.LoopOverITR(ITR=self.ITRList, ExtrapolationOrder=3)
 
 
 
         CppSolver.SortModes(Sorting=Sorting)
-        CppSolver1.SortModes(Sorting=Sorting)
+        #CppSolver1.SortModes(Sorting=Sorting)
 
         Set = SuperSet(ParentSolver=self)
 
-        self.PopulateSuperSet(Set, [CppSolver, CppSolver1])
+        self.PopulateSuperSet(Set, [CppSolver])
 
         return Set
 
 
 
     def PopulateSuperSet(self, Set, CppSolvers):
+        Set.CppSolvers = CppSolvers
         for CppSolver in CppSolvers:
             for BindingNumber in range(CppSolver.sMode):
                 Set.AppendSuperMode(CppSolver=CppSolver, BindingNumber=BindingNumber)

SuPyMode/Tools/BaseClass.py

@@ -118,7 +118,7 @@ def PlotCoupling(self, Scene, Col, Row, Combination):
 
 
     def PlotAdiabatic(self, Scene, Col, Row, Combination):
-        Adiabatic = Combination[0][0].CppSolver.ComputingAdiabatic()
+        Adiabatic = self.Adiabatic
         for (Mode0, Mode1) in Combination:
             Scene.AddLine(Row      = Row,
                           Col      = Col,

SuPyMode/includes/class.cpp

@@ -136,20 +136,33 @@ EigenSolving::LoopOverITR(ndarray ITRList, size_t order = 1){
 
   ScalarType alpha = -pow( k * ComputeMaxIndex(), 2 );
 
-  for (size_t i=0; i<ITRLength; ++i)
+  size_t barWidth = 70;
+  std::cout << "[";
+  for (size_t slice=0; slice<ITRLength; ++slice)
   {
+    double progress = (double) slice/ITRLength;
+
+    size_t pos = (size_t) (barWidth * progress);
+
+    for (size_t i = 0; i < barWidth; ++i) {
+        if (i < pos) std::cout << "=";
+        else if (i == pos) std::cout << ">";
+        else std::cout << " ";
+    }
+    std::cout << "] " << int(progress * 100.0) << " %\n";
+    std::cout.flush();
+
 
-    std::cout<<"Iteration: "<< i <<"   ITR:  "<<ITRPtr[i]<<"\n";
 
-    kDual = kInit * ITRPtr[i] ;
+    kDual = kInit * ITRPtr[slice] ;
 
     tie(EigenVectors, EigenValues) = ComputeEigen(alpha);
 
-    PopulateModes(i, EigenVectors, EigenValues);
+    PopulateModes(slice, EigenVectors, EigenValues);
 
     AllFirstEigenValues.push_back(EigenValues[0]);
 
-    size_t next = i+1, mode=0;
+    size_t next = slice+1, mode=0;
 
     alpha = ExtrapolateNext(order, AllFirstEigenValues, ITRList, next);
   }

Untitled.ipynb

@@ -51,13 +51,13 @@
 
 #SuperSet.PlotFields([-1])
 
-Mode = SuperSet.GetSuperposition(Amplitudes=[1,0,0,1,0,0])
+#Mode = SuperSet.GetSuperposition(Amplitudes=[1,0,0,1,0,0])
 
-Mode.CouplerLength = 500
-Mode.ComputeAmpltiudes(MaxStep=0.1)
+#Mode.CouplerLength = 500
+#Mode.ComputeAmpltiudes(MaxStep=0.1)
 
 
-Mode.PlotField(Slice=0)
+#Mode.PlotField(Slice=0)
 
 
 """