全部收敛，平衡节点的系数也为1.

Signed-off-by: facat <dmy@dmy-PC.(none)>
2012-05-23 11:05:42 +08:00
parent d935ac0f83
commit af1ea37c41
6 changed files with 25 additions and 20 deletions
--- a/ObjectiveFun.m
+++ b/ObjectiveFun.m
@@ -1,5 +1,6 @@
-function [out_arg]=ObjectiveFun(PG,PGi,PD,PD0,wD)
-
+function [out_arg]=ObjectiveFun(PG,PG0,PGi,PD,PD0,wG,wD)
+t1=PG(PGi)-PG0(PGi);
+t2=wG.*t1.*t1;
 t3=wD.*((PD-PD0).*(PD-PD0));
-out_arg= sum(t3);
+out_arg= sum(t2)+sum(t3);
 end