diff --git a/@Opti/obj.m b/@Opti/obj.m index 9fb5d67..ea00770 100644 --- a/@Opti/obj.m +++ b/@Opti/obj.m @@ -9,15 +9,15 @@ wPD=this.wPD; wQD=this.wQD; PD0=this.PD0; QD0=this.QD0; -% t4=(wPD(PDi).*(PD-PD0(PDi))).^2; -t4=wPD(PDi).*((PD-PD0(PDi))./PD0(PDi)).^2; -% t5=(wQD(QDi).*(QD-QD0(QDi))).^2; -t5=wQD(QDi).*((QD-QD0(QDi))./QD0(QDi)).^2; +t4=(wPD(PDi).*(PD-PD0(PDi))).^2; +% t4=wPD(PDi).*((PD-PD0(PDi))./PD0(PDi)).^2; +t5=(wQD(QDi).*(QD-QD0(QDi))).^2; +% t5=wQD(QDi).*((QD-QD0(QDi))./QD0(QDi)).^2; Volt0=this.Volt0; SEVolt=x(length(PDi)+length(QDi)+1:length(PDi)+length(QDi)+length(Volt0)); wVolt=this.wVolt; -% t6=(wVolt.*(SEVolt-Volt0)).^2; -t6=wVolt.*((SEVolt-Volt0)./Volt0).^2; +t6=(wVolt.*(SEVolt-Volt0)).^2; +% t6=wVolt.*((SEVolt-Volt0)./Volt0).^2; Balance=this.Balance; t6(Balance)=0;%不计算平衡节点的 % xx=t6(8);