diff --git a/.gitignore b/.gitignore index 28e76c3..e0e0a3e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ *.asv -/feeder13 +#/feeder13 *.mexw32 /DistributionNetwork-OnlyFortescue *.7z \ No newline at end of file diff --git a/FormLw.m b/FormLw.m index bca20fa..168d52b 100644 --- a/FormLw.m +++ b/FormLw.m @@ -7,6 +7,6 @@ function Lw=FormLw(Loadi,Mat_G,Init_U) % VoltU]; % t2=Mat_G+Init_U-t1; % Lw=t2; -upper=1*sparse(ones(length(Loadi)*1,1)); +upper=2*sparse(ones(length(Loadi)*1,1)); Lw=Mat_G+Init_U-upper; end \ No newline at end of file diff --git a/IPMLoop.m b/IPMLoop.m index ec3d661..3a4e3e3 100644 --- a/IPMLoop.m +++ b/IPMLoop.m @@ -55,7 +55,7 @@ while Gap>1e-5 && KK<20 [Init_Z,Init_L,Init_W,Init_U,Init_Y,V1r,V1i,I1r,I1i]=Modification(Init_Z,Init_L,Init_W,Init_U,Init_Y,deltZ,deltL,deltW,deltU,deltX,deltY,V1r,V1i,I1r,I1i,ContrlCount,Balance,busNum,Loadi,Vref); Gap=(Init_L'*Init_Z-Init_U'*Init_W); end - +f=sum(([real(measurement);imag(measurement)]-[-I1r;-I1i]).^2); end diff --git a/feeder13/Cap Data.xls b/feeder13/Cap Data.xls new file mode 100644 index 0000000..7d9834d Binary files /dev/null and b/feeder13/Cap Data.xls differ diff --git a/feeder13/Distributed Load Data.xls b/feeder13/Distributed Load Data.xls new file mode 100644 index 0000000..21ec9b4 Binary files /dev/null and b/feeder13/Distributed Load Data.xls differ diff --git a/feeder13/IEEE 13 Node Test Feeder.doc b/feeder13/IEEE 13 Node Test Feeder.doc new file mode 100644 index 0000000..2be1b2a Binary files /dev/null and b/feeder13/IEEE 13 Node Test Feeder.doc differ diff --git a/feeder13/Line Data.xls b/feeder13/Line Data.xls new file mode 100644 index 0000000..2299c58 Binary files /dev/null and b/feeder13/Line Data.xls differ diff --git a/feeder13/Regulator Data.xls b/feeder13/Regulator Data.xls new file mode 100644 index 0000000..b919d6b Binary files /dev/null and b/feeder13/Regulator Data.xls differ diff --git a/feeder13/Spot Load Data.xls b/feeder13/Spot Load Data.xls new file mode 100644 index 0000000..103e81e Binary files /dev/null and b/feeder13/Spot Load Data.xls differ diff --git a/feeder13/Transformer data.xls b/feeder13/Transformer data.xls new file mode 100644 index 0000000..2bf79b5 Binary files /dev/null and b/feeder13/Transformer data.xls differ diff --git a/feeder13/UG config.xls b/feeder13/UG config.xls new file mode 100644 index 0000000..bca247a Binary files /dev/null and b/feeder13/UG config.xls differ diff --git a/feeder13/config.xls b/feeder13/config.xls new file mode 100644 index 0000000..e27b846 Binary files /dev/null and b/feeder13/config.xls differ diff --git a/feeder13/data - 副本 (2) - 副本.txt b/feeder13/data - 副本 (2) - 副本.txt new file mode 100644 index 0000000..2cf4bae --- /dev/null +++ b/feeder13/data - 副本 (2) - 副本.txt @@ -0,0 +1,13 @@ +650 +0 +602 632 633 500 +601 650 632 2000 +601 632 671 2000 +601 671 680 1000 +0 +0 +633 160 120 120 110 90 90 +671 385 385 385 220 220 220 +0 + + diff --git a/feeder13/data - 副本.txt b/feeder13/data - 副本.txt new file mode 100644 index 0000000..372bbe6 --- /dev/null +++ b/feeder13/data - 副本.txt @@ -0,0 +1,16 @@ +650 +0 +603 632 645 500 +602 632 633 500 +-1 633 634 0 +603 645 646 300 +601 650 632 2000 +607 684 652 800 +601 632 671 2000 +604 671 684 300 +601 671 680 1000 +-2 671 692 0 +605 684 611 300 +606 692 675 500 +0 + diff --git a/feeder13/data.xls b/feeder13/data.xls new file mode 100644 index 0000000..8260943 Binary files /dev/null and b/feeder13/data.xls differ diff --git a/feeder13/data1.txt b/feeder13/data1.txt new file mode 100644 index 0000000..0b1c5b9 --- /dev/null +++ b/feeder13/data1.txt @@ -0,0 +1,12 @@ +650 4.16 +0 +601 650 632 2000 +602 632 631 2000 +0 +632 30 0 0 +0 +632 120 120 120 110 90 90 +631 90 100 110 80 90 90 +0 + + diff --git a/feeder13/data2 - 副本.txt b/feeder13/data2 - 副本.txt new file mode 100644 index 0000000..2cf4bae --- /dev/null +++ b/feeder13/data2 - 副本.txt @@ -0,0 +1,13 @@ +650 +0 +602 632 633 500 +601 650 632 2000 +601 632 671 2000 +601 671 680 1000 +0 +0 +633 160 120 120 110 90 90 +671 385 385 385 220 220 220 +0 + + diff --git a/feeder13/data2.txt b/feeder13/data2.txt new file mode 100644 index 0000000..ef1d29b --- /dev/null +++ b/feeder13/data2.txt @@ -0,0 +1,12 @@ +650 4.16 +0 +602 632 633 500 +601 650 632 2000 +601 632 671 2000 +601 671 680 1000 +0 +0 +671 385 385 385 220 220 220 +0 + + diff --git a/feeder13/feeder13.zip b/feeder13/feeder13.zip new file mode 100644 index 0000000..f8f5cca Binary files /dev/null and b/feeder13/feeder13.zip differ diff --git a/feeder13/ie13.TCW b/feeder13/ie13.TCW new file mode 100644 index 0000000..152a9d6 Binary files /dev/null and b/feeder13/ie13.TCW differ diff --git a/feeder13/lineParameter - 副本.txt b/feeder13/lineParameter - 副本.txt new file mode 100644 index 0000000..b24a66b --- /dev/null +++ b/feeder13/lineParameter - 副本.txt @@ -0,0 +1,27 @@ +601 +0.3465 0.1560 0.1580 +0.1560 0.3375 0.1535 +0.1580 0.1535 0.3414 +0 +1.0179 0.5017 0.4236 +0.5017 1.0478 0.3849 +0.4236 0.3849 1.0348 +0 +6.2998 -1.9958 -1.2595 +-1.9958 5.9597 -0.7417 +-1.2595 -0.7417 5.6386 +0 +602 +0.7526 0.1580 0.1560 +0.1580 0.7475 0.1535 +0.1560 0.1535 0.7436 +0 +1.1814 0.4236 0.5017 +0.4236 1.1983 0.3849 +0.5017 0.3849 1.2112 +0 +5.6990 -1.0817 -1.6905 +-1.0817 5.1795 -0.6588 +-1.6905 -0.6588 5.4246 +0 + diff --git a/feeder13/lineParameter.txt b/feeder13/lineParameter.txt new file mode 100644 index 0000000..8358036 --- /dev/null +++ b/feeder13/lineParameter.txt @@ -0,0 +1,40 @@ +600 +0.3465 0.1560 0.1580 +0.1560 0.3375 0.1535 +0.1580 0.1535 0.3414 +0 +1.0179 0.5017 0.4236 +0.5017 1.0478 0.3849 +0.4236 0.3849 1.0348 +0 +6.2998 -1.9958 -1.2595 +-1.9958 5.9597 -0.7417 +-1.2595 -0.7417 5.6386 +0 +601 +0.3465 0.1560 0.1580 +0.1560 0.3375 0.1535 +0.1580 0.1535 0.3414 +0 +1.0179 0.5017 0.4236 +0.5017 1.0478 0.3849 +0.4236 0.3849 1.0348 +0 +6.2998 -1.9958 -1.2595 +-1.9958 5.9597 -0.7417 +-1.2595 -0.7417 5.6386 +0 +602 +0.7526 0.1580 0.1560 +0.1580 0.7475 0.1535 +0.1560 0.1535 0.7436 +0 +1.1814 0.4236 0.5017 +0.4236 1.1983 0.3849 +0.5017 0.3849 1.2112 +0 +5.6990 -1.0817 -1.6905 +-1.0817 5.1795 -0.6588 +-1.6905 -0.6588 5.4246 +0 + diff --git a/feeder13/note.txt b/feeder13/note.txt new file mode 100644 index 0000000..80a3e26 --- /dev/null +++ b/feeder13/note.txt @@ -0,0 +1,3 @@ +line data +XFM-1 -1 +Switch -2 \ No newline at end of file