加入部分负荷未知的情况。修复了有功无功上下界的一个bug。

Signed-off-by: facat <dmy@dmy-PC.(none)>
2012-05-25 15:38:31 +08:00
parent f2781393a7
commit 460c49829b
19 changed files with 122 additions and 136 deletions
--- a/ObjectiveFun.m
+++ b/ObjectiveFun.m
@@ -1,6 +1,6 @@
-function [out_arg]=ObjectiveFun(PG,PG0,PGi,PD,PD0,wG,wD)
+function [out_arg]=ObjectiveFun(PG,PG0,PGi,PD,PD0,wG,wD,Loadi)
 t1=PG(PGi)-PG0(PGi);
 t2=wG.*t1.*t1;
-t3=wD.*((PD-PD0).*(PD-PD0));
+t3=wD.*((PD(Loadi)-PD0(Loadi)).*(PD(Loadi)-PD0(Loadi)));
 out_arg= sum(t2)+sum(t3);
 end