diff --git a/IPMLoop.m b/IPMLoop.m index 421fb72..c11e597 100644 --- a/IPMLoop.m +++ b/IPMLoop.m @@ -26,7 +26,7 @@ Init_L=1*sparse(ones(RestraintCount,1)); Init_U=1*sparse(ones(RestraintCount,1)); Init_Y=sparse(2*busNum,1);%等式约束乘子 Gap=(Init_L'*Init_Z-Init_U'*Init_W); -kmax=15; +kmax=30; isSetBound=0; largerBound=0; realBound=1; @@ -42,9 +42,15 @@ lower=ones(length(boundedLoadi)*2,1); if realBound==1 isSetBound=1; lower(pIr)=(0.7)*Ir(pIr); - lower(nIr)=(1.300)*Ir(nIr); + lower(nIr)=(1.3)*Ir(nIr); lower(pIi+length(Ir))=(0.7)*Ii(pIi); - lower(nIi+length(Ir))=(1.30)*Ii(nIi); + lower(nIi+length(Ir))=(1.3)*Ii(nIi); + +% lower(pIr)=-0.1; +% lower(nIr)=-0.1; +% lower(pIi+length(Ir))=-0.1; +% lower(nIi+length(Ir))=-0.1; + end Ir=real(guessIf1(ismember(Loadi,boundedLoadi))); @@ -57,10 +63,14 @@ upper=ones(length(boundedLoadi)*2,1); % if abs(Gap)<1 || isSetBound==1 if realBound==1 isSetBound=1; - upper(pIr)=(1.30)*Ir(pIr); + upper(pIr)=(1.3)*Ir(pIr); upper(nIr)=(0.7)*Ir(nIr); - upper(pIi+length(Ir))=(1.30)*Ii(pIi); + upper(pIi+length(Ir))=(1.3)*Ii(pIi); upper(nIi+length(Ir))=(0.7)*Ii(nIi); +% upper(pIr)=0.1; +% upper(nIr)=0.1; +% upper(pIi+length(Ir))=0.1; +% upper(nIi+length(Ir))=0.1; end tic while(abs(Gap)>1e-5) @@ -111,6 +121,7 @@ deltG=func_deltGstate1(busNum,Loadi,boundedLoadi,I1r,I1i); fprintf('Gap %f :%d\n',full(Gap),KK+1); KK=KK+1; end +calcuTime=0; % toc calcuTime=toc; % f=sum(([real(I1measurement);imag(I1measurement)]-[I1r;I1i]).^2)+sum((real(V1measurement)-V1r(Loadi)).^2)+sum((imag(V1measurement)-V1i(Loadi)).^2); diff --git a/func_deltF.m b/func_deltF.m index 6dd956c..6cffbdc 100644 --- a/func_deltF.m +++ b/func_deltF.m @@ -7,10 +7,21 @@ function deltF=func_deltF(V1measurement,wV1r,wV1i,I1measurement,wI1r,wI1i,busNum % PBal=t5(Balance); % PPG=([PQ(1),PBal])';%暂时用土办法处理一下 -% wV1r=(0.01)^2.*ones(length(wV1r),1); -% wV1i=(0.01)^2.*ones(length(wV1i),1); -% wI1r=(0.03)^2.*ones(length(wI1r),1); -% wI1i=(0.03)^2.*ones(length(wI1i),1); +% wV1r_=(1)^2.*ones(length(wV1r),1); +% wV1i_=(1)^2.*ones(length(wV1i),1); +% wI1r_=(1)^2.*ones(length(wI1r),1); +% wI1i_=(1)^2.*ones(length(wI1i),1); +% +% infWV=find(wV1r==Inf); +% infWI=find(wI1r==Inf); +% wV1r=wV1r_; +% wV1i=wV1i_; +% wI1r=wI1r_; +% wI1i=wI1i_; +% wV1r(infWV)=Inf; +% wV1i(infWV)=Inf; +% wI1r(infWI)=Inf; +% wI1i(infWI)=Inf; %% deltF=[ diff --git a/func_deltdeltF.m b/func_deltdeltF.m index aa1605e..e3b2e69 100644 --- a/func_deltdeltF.m +++ b/func_deltdeltF.m @@ -1,8 +1,19 @@ function deltdeltF=func_deltdeltF(busNum,fsY11,Loadi,wV1r,wV1i,wI1r,wI1i,V1measurement,V1r,V1i) -% wV1r=(0.01)^2*ones(length(wV1r),1); -% wV1i=(0.01)^2*ones(length(wV1i),1); -% wI1r=(0.03)^2*ones(length(wI1r),1); -% wI1i=(0.03)^2*ones(length(wI1i),1); +% wV1r_=(1)^2*ones(length(wV1r),1); +% wV1i_=(1)^2*ones(length(wV1i),1); +% wI1r_=(1)^2*ones(length(wI1r),1); +% wI1i_=(1)^2*ones(length(wI1i),1); +% infWV=find(wV1r==Inf); +% infWI=find(wI1r==Inf); +% wV1r=wV1r_; +% wV1i=wV1i_; +% wI1r=wI1r_; +% wI1i=wI1i_; +% wV1r(infWV)=Inf; +% wV1i(infWV)=Inf; +% wI1r(infWI)=Inf; +% wI1i(infWI)=Inf; + W2=wV1r.*wV1r; t1=-2*V1r(Loadi).*V1r(Loadi)+ abs(V1measurement).^2; t2=-(V1r(Loadi).^2+ V1i(Loadi).^2); diff --git a/modified-feeder69/data-鏌愮浉娌¤礋鑽.txt b/modified-feeder69/data-鏌愮浉娌¤礋鑽.txt new file mode 100644 index 0000000..55f0f96 --- /dev/null +++ b/modified-feeder69/data-鏌愮浉娌¤礋鑽.txt @@ -0,0 +1,154 @@ +1000 12.66 +0 +222 1000 1 1 +222 1 2 1 +222 2 3 3 +222 3 4 50 +222 4 5 730 +222 5 6 760 +222 6 7 185 +222 7 8 99 +222 8 9 1638 +222 9 10 374 +222 10 11 1442 +222 11 12 2060 +222 12 13 2088 +222 13 14 2116 +222 14 15 393 +222 15 16 748 +222 16 17 10 +222 17 18 655 +222 18 19 421 +222 19 20 683 +222 20 21 28 +222 21 22 318 +222 22 23 692 +222 23 24 1497 +222 24 25 617 +222 25 26 346 +222 2 27 9 +222 27 28 128 +222 28 29 795 +222 29 30 140 +222 30 31 702 +222 31 32 1678 +222 32 33 3416 +222 33 34 2948 +222 2 277 9 +222 277 288 128 +222 288 65 210 +222 65 66 60 +222 66 67 4 +222 67 68 1456 +222 68 69 620 +222 69 70 82 +222 70 88 18 +222 88 89 217 +222 89 90 2 +222 3 35 7 +222 35 36 172 +222 36 37 580 +222 37 38 164 +222 7 40 185 +222 40 41 663 +222 8 42 384 +222 42 43 406 +222 43 44 567 +222 44 45 562 +222 45 46 3180 +222 46 47 1567 +222 47 48 608 +222 48 49 772 +222 49 50 1015 +222 50 51 194 +222 51 52 290 +222 52 53 1421 +222 53 54 2082 +222 10 55 402 +222 55 56 9 +222 11 57 1478 +222 57 58 9 +0 +692 0 0 0 +0 +5 36.2 34.9 36.1 34.8 36.3 35 +6 51.5 48 51.4 47.9 51.6 48.1 +7 25 18 24.9 17.9 25.1 18.1 +8 48 45.3 47.9 45.2 48.1 45.4 +9 36.9 33.9 36.8 33.8 37 34 +10 48.3 34.7 48.2 34.6 48.4 34.8 +11 48.3 34.7 48.2 34.6 48.4 34.8 +12 9.33 5.17 9.23 5.07 9.43 5.27 +13 9.33 5.17 9.23 5.07 9.43 5.27 +15 15.2 10 15.1 99 15.3 10.1 +16 58 49.7 57.9 49.6 58.1 49.8 +17 20 11.7 19.9 11.6 20.1 11.8 +19 37.7 36.3 37.6 36.2 37.8 36.4 +20 38 2.7 37.9 26.9 38.1 27.1 +21 46.4 45.8 46.3 45.7 46.5 45.9 +23 47.3 44.7 47.2 44.6 47.4 44.8 +25 32.2 30.9 32.1 30.8 32.3 31 +26 32.2 30.9 32.1 30.8 32.3 31 +27 8.67 6.2 8.57 6.1 8.77 6.3 +28 36.2 33.7 36.1 33.6 36.3 33.8 +277 46.7 44.2 46.6 44.1 46.8 44.3 +288 8.67 6.18 8.57 6.08 8.77 6.28 +32 4.67 3.33 4.57 3.23 4.77 3.43 +33 44.5 42.7 44.4 42.6 44.6 42.8 +34 32.9 33.2 32.8 32.1 33 32.3 +36 64.3 56.8 64.2 56.7 64.4 56.9 +37 1 1 140.8 183.9 12.8 91.6 +38 1 1 140.8 183.9 12.8 91.6 +40 43.5 39.4 43.4 39.3 43.6 39.5 +41 45.5 42.2 45.4 42.1 45.6 42.3 +42 31.5 31.2 31.4 31.1 31.6 31.3 +43 46.8 44.3 46.7 44.2 46.9 44.4 +44 8 5.73 7.9 5.63 8.1 5.83 +48 33.3 24 33.2 23.9 33.4 24.1 +50 1 1 830 592 415 296 +51 78.7 75.7 78.6 75.6 78.8 75.8 +53 75.7 54 75.6 53.9 75.8 54.1 +54 87.7 82 87.6 81.9 87.8 82.1 +55 74 72.3 73.9 72.2 74.1 72.4 +56 36 34.3 35.9 34.2 36.1 34.4 +57 39.3 36.7 39.2 36.6 39.4 36.8 +58 80.3 77.7 80.2 77.6 80.4 77.8 +70 43.3 42.8 43.2 42.7 43.4 42.9 +89 13.1 8.77 13 86.7 13.2 8.87 +90 51.1 46.8 51 46.7 51.2 46.9 +66 35.5 33.2 35.4 33.1 35.6 33.3 +67 35.5 33.2 35.4 33.1 35.6 33.3 +68 7.07 3.67 6.97 3.57 7.17 3.77 +0 +600 632 645 500 +602 632 633 500 +601 633 634 600 +600 645 646 300 +601 650 632 2000 +602 684 652 800 +601 632 671 2000 +600 671 684 300 +602 671 680 1000 +600 671 692 300 +602 684 611 300 +601 692 675 500 +0 +632 0 0 0 +0 +634 160 110 120 90 120 90 +645 123 102 170 125 133 110 +646 172 150 230 132 0 211 160 +652 128 86 30 10 80 70 +671 385 220 385 220 385 220 +675 485 190 68 60 290 212 +692 142 140 153 121 170 151 +611 156 142 185 60 170 80 +0 +634 160 110 120 90 120 90 +645 123 102 170 125 133 110 +646 17 15 23 13 21 16 +652 128 86 30 10 80 70 +675 85 10 68 60 20 12 +611 52 42 85 60 70 40 +680 12 4 10 6 7 4 + diff --git a/run.m b/run.m index 5540935..3e49804 100644 --- a/run.m +++ b/run.m @@ -9,36 +9,38 @@ lineZ=readLineZ('modified-feeder69\lineParameter.txt'); phaseASpotLoadQ,phaseBSpotLoadQ,phaseCSpotLoadQ,setIJ,nodeNum,Balance,phaseABCY ... cap]=dataRead(lineZ,'modified-feeder69\data.txt'); %负荷不平衡 -for I=1:length(phaseASpotLoadP) - roll=mod(round(rand()*10),3); - if roll==0 - phaseBSpotLoadP(I)=phaseBSpotLoadP(I)+phaseASpotLoadP(I)*.45; - phaseCSpotLoadP(I)=phaseCSpotLoadP(I)+phaseASpotLoadP(I)*.45; - phaseASpotLoadP(I)=phaseASpotLoadP(I)*.10; - - phaseBSpotLoadQ(I)=phaseBSpotLoadQ(I)+phaseASpotLoadQ(I)*.45; - phaseCSpotLoadQ(I)=phaseCSpotLoadQ(I)+phaseASpotLoadQ(I)*.45; - phaseASpotLoadQ(I)=phaseASpotLoadQ(I)*.10; - end - if roll==1 - phaseASpotLoadP(I)=phaseASpotLoadP(I)+phaseBSpotLoadP(I)*.45; - phaseCSpotLoadP(I)=phaseCSpotLoadP(I)+phaseBSpotLoadP(I)*.45; - phaseBSpotLoadP(I)=phaseBSpotLoadP(I)*.10; - - phaseASpotLoadQ(I)=phaseASpotLoadQ(I)+phaseBSpotLoadQ(I)*.45; - phaseCSpotLoadQ(I)=phaseCSpotLoadQ(I)+phaseBSpotLoadQ(I)*.45; - phaseBSpotLoadQ(I)=phaseBSpotLoadQ(I)*.10; - end - if roll==2 - phaseASpotLoadP(I)=phaseASpotLoadP(I)+phaseCSpotLoadP(I)*.45; - phaseBSpotLoadP(I)=phaseBSpotLoadP(I)+phaseCSpotLoadP(I)*.45; - phaseCSpotLoadP(I)=phaseCSpotLoadP(I)*.10; - - phaseASpotLoadQ(I)=phaseASpotLoadQ(I)+phaseCSpotLoadQ(I)*.45; - phaseBSpotLoadQ(I)=phaseBSpotLoadQ(I)+phaseCSpotLoadQ(I)*.45; - phaseCSpotLoadQ(I)=phaseCSpotLoadQ(I)*.10; - end -end +% for I=1:length(phaseASpotLoadP) +% roll=mod(round(rand()*10),3); +% if roll==0 +% phaseBSpotLoadP(I)=phaseBSpotLoadP(I)+phaseASpotLoadP(I)*.45; +% phaseCSpotLoadP(I)=phaseCSpotLoadP(I)+phaseASpotLoadP(I)*.45; +% phaseASpotLoadP(I)=phaseASpotLoadP(I)*.10; +% +% phaseBSpotLoadQ(I)=phaseBSpotLoadQ(I)+phaseASpotLoadQ(I)*.45; +% phaseCSpotLoadQ(I)=phaseCSpotLoadQ(I)+phaseASpotLoadQ(I)*.45; +% phaseASpotLoadQ(I)=phaseASpotLoadQ(I)*.10; +% end +% if roll==1 +% phaseASpotLoadP(I)=phaseASpotLoadP(I)+phaseBSpotLoadP(I)*.45; +% phaseCSpotLoadP(I)=phaseCSpotLoadP(I)+phaseBSpotLoadP(I)*.45; +% phaseBSpotLoadP(I)=phaseBSpotLoadP(I)*.10; +% +% phaseASpotLoadQ(I)=phaseASpotLoadQ(I)+phaseBSpotLoadQ(I)*.45; +% phaseCSpotLoadQ(I)=phaseCSpotLoadQ(I)+phaseBSpotLoadQ(I)*.45; +% phaseBSpotLoadQ(I)=phaseBSpotLoadQ(I)*.10; +% end +% if roll==2 +% phaseASpotLoadP(I)=phaseASpotLoadP(I)+phaseCSpotLoadP(I)*.45; +% phaseBSpotLoadP(I)=phaseBSpotLoadP(I)+phaseCSpotLoadP(I)*.45; +% phaseCSpotLoadP(I)=phaseCSpotLoadP(I)*.10; +% +% phaseASpotLoadQ(I)=phaseASpotLoadQ(I)+phaseCSpotLoadQ(I)*.45; +% phaseBSpotLoadQ(I)=phaseBSpotLoadQ(I)+phaseCSpotLoadQ(I)*.45; +% phaseCSpotLoadQ(I)=phaseCSpotLoadQ(I)*.10; +% end +% end + +%% 有几相负荷为0 a=exp(1j*2*pi/3); Tp2f=1/3*[1 1 1; @@ -271,8 +273,10 @@ wI1r=wI1r(Loadi); wI1i=sqrt(1/9*(IAiW+0.5^2.*IBiW+0.8668^2.*IBrW+0.5^2.*ICiW+0.866^2.*ICrW)); wI1i=wI1i(Loadi); -wV1r=sqrt(2*( (abs(mVoltpA).*sigma).^2+(abs(mVoltpB).*sigma).^2+(abs(mVoltpC).*sigma).^2 )/9.*abs(mfV1) ); -wV1i=sqrt(2*( (abs(mVoltpA).*sigma).^2+(abs(mVoltpB).*sigma).^2+(abs(mVoltpC).*sigma).^2 )/9.*abs(mfV1) ); +wV1r=sqrt(2*( (abs(mVoltpA).*sigma/3).^2+(abs(mVoltpB).*sigma/3).^2+(abs(mVoltpC).*sigma/3).^2 )/9.*abs(mfV1) ); +wV1r=sqrt( (1/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV1) ); +wV1i=sqrt(2*( (abs(mVoltpA).*sigma/3).^2+(abs(mVoltpB).*sigma/3).^2+(abs(mVoltpC).*sigma/3).^2 )/9.*abs(mfV1) ); +wV1i=sqrt( (1/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV1) ); wV1r=wV1r(Loadi); wV1i=wV1i(Loadi); % [ V1r,V1i,I1r,I1i ]=IPMLoop(V1measurement,wV1r,wV1i,I1measurement,wI1r,wI1i,BalI1r,BalI1i,busNum,Loadi,fsY11,Balance,1 ); @@ -309,8 +313,10 @@ wI2r=wI2r(Loadi); wI2i=sqrt(1/9*(IAiW+0.5^2.*IBiW+0.8668^2.*IBrW+0.5^2.*ICiW+0.866^2.*ICrW)); wI2i=wI2i(Loadi); -wV2r=sqrt(2*( (abs(mVoltpA).*sigma).^2+(abs(mVoltpB).*sigma).^2+(abs(mVoltpC).*sigma).^2 )/9.*abs(mfV2) ); -wV2i=sqrt(2*( (abs(mVoltpA).*sigma).^2+(abs(mVoltpB).*sigma).^2+(abs(mVoltpC).*sigma).^2 )/9.*abs(mfV2) ); +wV2r=sqrt(2*( (abs(mVoltpA).*sigma/3).^2+(abs(mVoltpB).*sigma/3).^2+(abs(mVoltpC).*sigma/3).^2 )/9.*abs(mfV2) ); +wV2r=sqrt( (1/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV2) ); +wV2i=sqrt(2*( (abs(mVoltpA).*sigma/3).^2+(abs(mVoltpB).*sigma/3).^2+(abs(mVoltpC).*sigma/3).^2 )/9.*abs(mfV2) ); +wV2i=sqrt( (1/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV2) ); wV2r=wV2r(Loadi); wV2i=wV2i(Loadi); @@ -349,21 +355,24 @@ wI0r=wI0r(Loadi); wI0i=sqrt(1/9*(IAiW+IBiW+ICiW)); wI0i=wI0i(Loadi); -wV0r=sqrt(2*( (abs(mVoltpA).*sigma).^2+(abs(mVoltpB).*sigma).^2+(abs(mVoltpC).*sigma).^2 )/9.*abs(mfV0) ); -wV0i=sqrt(2*( (abs(mVoltpA).*sigma).^2+(abs(mVoltpB).*sigma).^2+(abs(mVoltpC).*sigma).^2 )/9.*abs(mfV0) ); +wV0r=sqrt(2*( (abs(mVoltpA).*sigma/3).^2+(abs(mVoltpB).*sigma/3).^2+(abs(mVoltpC).*sigma/3).^2 )/9.*abs(mfV0) ); +wV0r=sqrt( (1/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV0) ); +wV0i=sqrt(2*( (abs(mVoltpA).*sigma/3).^2+(abs(mVoltpB).*sigma/3).^2+(abs(mVoltpC).*sigma/3).^2 )/9.*abs(mfV0) ); +wV0i=sqrt( (1/4*(abs(mVoltpA)+abs(mVoltpC)+abs(mVoltpC)).^2).*abs(mfV0) ); wV0r=wV0r(Loadi); wV0i=wV0i(Loadi); % matlabpool local 3 %% 用三相方差确定三序方差 %% 不同量测配置 -% noLoadi=[1,8,10,12]; -noLoadi=[1:9:max(Loadi)]; +noLoadi=[1,8,10,12]; +% noLoadi=[1:9:max(Loadi)]; noLoadi=Loadi(1:6:end); % noLoadi=[1,19]; % noLoadi=[4,3,2,5,6,7,11,14,22]; -noLoadi=Loadi; -% noLoadi=[5]; +% noLoadi=Loadi; +% noLoadi=[8]; +noLoadi=[5]; wI0r(ismember(Loadi,noLoadi))=1e100000; wI0i(ismember(Loadi,noLoadi))=1e100000; wI1r(ismember(Loadi,noLoadi))=1e100000; @@ -519,10 +528,21 @@ AME_Volt=sum(sum(abs( abs(rVoltABCV)-abs(SEVoltpABC))))/size(rVoltABCV,1)/size(r AME_VAngle=sum(sum(abs( angle(rVoltABCV)-angle(SEVoltpABC))))/size(rVoltABCV,1)/size(rVoltABCV,2); AME_PD=sum(sum(abs(real(SEThreeLoad-rThreeLoad(:,Loadi)))))/length(Loadi)/3; AME_QD=sum(sum(abs(imag(SEThreeLoad-rThreeLoad(:,Loadi)))))/length(Loadi)/3; + +% AME_Volt=sum(sum(abs( abs(rVoltABCV)-abs(SEVoltpABC)))); +% AME_VAngle=sum(sum(abs( angle(rVoltABCV)-angle(SEVoltpABC)))); +% AME_PD=sum(sum(abs(real(SEThreeLoad-rThreeLoad(:,Loadi))))); +% AME_QD=sum(sum(abs(imag(SEThreeLoad-rThreeLoad(:,Loadi))))); + %计算与量测值的 AME_mVolt=sum(sum(abs( abs(mVoltABCV)-abs(rVoltABCV))))/size(rVoltABCV,1)/size(rVoltABCV,2); AME_mPD=sum(sum(abs(real(rThreeLoad(:,Loadi)-mThreeLoad(:,Loadi)))))/length(Loadi)/3; AME_mQD=sum(sum(abs(imag(rThreeLoad(:,Loadi)-mThreeLoad(:,Loadi)))))/length(Loadi)/3; + +% AME_mVolt=sum(sum(abs( abs(mVoltABCV)-abs(rVoltABCV)))); +% AME_mPD=sum(sum(abs(real(rThreeLoad(:,Loadi)-mThreeLoad(:,Loadi))))); +% AME_mQD=sum(sum(abs(imag(rThreeLoad(:,Loadi)-mThreeLoad(:,Loadi))))); + %无偏估计 % AME_Volt=abs(rVoltABCV)-abs(SEVoltpABC); % AME_VAngle= ( (( angle(rVoltABCV)-angle(SEVoltpABC)))); @@ -534,4 +554,15 @@ AME_mQD=sum(sum(abs(imag(rThreeLoad(:,Loadi)-mThreeLoad(:,Loadi)))))/length(Load % AME_mQD= ( ((imag(rThreeLoad(:,Loadi)-mThreeLoad(:,Loadi))))); %返回收敛信息 isConverged=isConverged1*isConverged2*isConverged0; + +% phaseASpotLoadP=sparse(Loadi,1,real(SEThreeLoad(1,:)),12,1); +% phaseBSpotLoadP=sparse(Loadi,1,real(SEThreeLoad(2,:)),12,1); +% phaseCSpotLoadP=sparse(Loadi,1,real(SEThreeLoad(3,:)),12,1); +% phaseASpotLoadQ=sparse(Loadi,1,imag(SEThreeLoad(1,:)),12,1); +% phaseBSpotLoadQ=sparse(Loadi,1,imag(SEThreeLoad(2,:)),12,1); +% phaseCSpotLoadQ=sparse(Loadi,1,imag(SEThreeLoad(3,:)),12,1); +% ub=checkSSatisfied(Balance,phaseABCY,SEVoltpABC, ... +% phaseASpotLoadP,phaseBSpotLoadP,phaseCSpotLoadP, ... +% phaseASpotLoadQ,phaseBSpotLoadQ,phaseCSpotLoadQ ); + end \ No newline at end of file diff --git a/test.m b/test.m index 4156aff..e54e787 100644 --- a/test.m +++ b/test.m @@ -9,9 +9,9 @@ AME_QDSum=0; AME_mVoltSum=0; AME_mPDSum=0; AME_mQDSum=0; -totalTime1Sum=10000; -totalTime2Sum=10000; -totalTime0Sum=10000; +totalTime1Sum=0; +totalTime2Sum=0; +totalTime0Sum=0; timeOfPrepare=0.00272333333;%准备数据的时间 timeOfPrepare=0; eV2Sum=0; @@ -43,12 +43,12 @@ while 1 eI0Sum=eI0Sum+eI0; %时间 -% totalTime1Sum=totalTime1Sum+totalTime1; -% totalTime2Sum=totalTime2Sum+totalTime2; -% totalTime0Sum=totalTime0Sum+totalTime0; - totalTime1Sum=min([totalTime1Sum,totalTime1]); -totalTime2Sum=min([totalTime2Sum,totalTime2]); -totalTime0Sum=min([totalTime0Sum,totalTime0]); + totalTime1Sum=totalTime1Sum+totalTime1; +totalTime2Sum=totalTime2Sum+totalTime2; +totalTime0Sum=totalTime0Sum+totalTime0; +% totalTime1Sum=min([totalTime1Sum,totalTime1]); +% totalTime2Sum=min([totalTime2Sum,totalTime2]); +% totalTime0Sum=min([totalTime0Sum,totalTime0]); end JMeasurementSum=JMeasurementSum/N; AME_VoltSum=AME_VoltSum/N; @@ -63,9 +63,9 @@ eV0Sum=eV0Sum/N; eI2Sum=eI2Sum/N; eI0Sum=eI0Sum/N; - totalTime1Sum=totalTime1Sum+timeOfPrepare; -totalTime2Sum=totalTime2Sum+timeOfPrepare; -totalTime0Sum=totalTime0Sum+timeOfPrepare; -% totalTime1Sum=totalTime1Sum/N; -% totalTime2Sum=totalTime2Sum/N; -% totalTime0Sum=totalTime0Sum/N; \ No newline at end of file +% totalTime1Sum=totalTime1Sum+timeOfPrepare; +% totalTime2Sum=totalTime2Sum+timeOfPrepare; +% totalTime0Sum=totalTime0Sum+timeOfPrepare; +totalTime1Sum=totalTime1Sum/N; +totalTime2Sum=totalTime2Sum/N; +totalTime0Sum=totalTime0Sum/N; \ No newline at end of file