Changeset 867 for applications/dual

Timestamp:

03/16/10 11:31:42 (14 years ago)

Author:

smidl

Message:

tolerance+rho

Files:

• applications/dual/IterativeLocal/pmsm_ildp3.m (modified) (4 diffs)

applications/dual/IterativeLocal/pmsm_ildp3.m

@@ -8 +8 @@
    
     Iterace = 5; %iterace
-    K = 50; %casy
+    K = 5; %casy
     N = 50; %vzorky
 
@@ -72 +72 @@
 %     rhot = 0.00005;
 %     rhop = 0.0001;
-    rhoi = 1.5;
-    rhoo = 1.5;
-    rhot = 1.5;
-    rhop = 1.5;
+    rhoi = sqrt(mQ(1,1)); %1.5;
+    rhoo = sqrt(mQ(3,3));%1.5;
+    rhot = sqrt(mQ(4,4));%1.5;
+    rhop = 0.001;
     
     %zvetseni hamiltonianu pro minimalizace
 %     mag = 1000;
-    mag = 5;
+    mag = 1;
     
     %prepinac sumu on/off
-    noise = 1;
+    noise = 0;
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     %globalni promenne
@@ -168 +168 @@
             for n = 1:N,
                gnu = n; 
-                [Uopt2(:, n), Hmin(n)] = fmincon(@Hamilt, uPi(k, Xkn(:, k, n),Pkn(:, :, k, n)), [], [], [], [], [], [], @Cond2, optimset('GradConstr','on','Display','notify','Algorithm','active-set'));                
+                [Uopt2(:, n), Hmin(n)] = fmincon(@Hamilt, uPi(k, Xkn(:, k, n),Pkn(:, :, k, n)), [], [], [], [], [], [], @Cond2, optimset('GradConstr','on','Display','notify','Algorithm','active-set','TolFun',1e-12));                
 %                 Uopt2(1,n)=sin(2*pi/20*k);
 %                 Z = zeros(101,101);
@@ -195 +195 @@
             end
             mFi = matrixFi(Epsilon);
-            FiFiTInvFi = (mFi*mFi')\mFi;
+            FiFiTInvFi = inv(mFi*mFi'+1e-5*eye(25))*mFi;
             Wv(:,k) = FiFiTInvFi * Vn';