From 1aede16a23f19a9deec8e3b5f089d17c84d8f35f Mon Sep 17 00:00:00 2001 From: someone Date: Tue, 5 Jun 2012 19:50:58 +0200 Subject: [PATCH] =?utf8?q?19:43:01=20=20was=20unabh=C3=A4ngig=20dav?= =?utf8?q?on:=20w=5Fcharge=20ist=20afaik=20w=5Fcharge/1=20nicht=20w=5Fchar?= =?utf8?q?ge/2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- c.dl | 12 ++++++------ c.test1.dl | 2 +- c.test2.dl | 2 +- c.test3.dl | 2 +- c.test4.dl | 2 +- c.test5.dl | 2 +- c.test6.dl | 2 +- c.test7.dl | 2 +- c.test8.dl | 2 +- c.test9.dl | 2 +- connect.dl | 2 +- psh.dl | 4 ++-- psh.test1.dl | 2 +- psh.test2.dl | 2 +- psh.test3.dl | 2 +- psh.test4.dl | 2 +- psh.test5.dl | 2 +- psh.test6.dl | 2 +- psh.test7.dl | 2 +- psh.test8.dl | 2 +- 20 files changed, 26 insertions(+), 26 deletions(-) diff --git a/c.dl b/c.dl index d111541..535c971 100644 --- a/c.dl +++ b/c.dl @@ -20,12 +20,12 @@ c(C,o4,OP) :- not ab(C), control(C), c(C,i1,Icur), c(C,i2,Idem), c(C,i3,full), I c(C,o5,OP) :- not ab(C), control(C), c(C,i1,Icur), c(C,i2,Idem), c(C,i3,full), Idem <= Icur, OP = 0, #int(OP). % charge psh (over max) -c(C,o1,OP) :- not ab(C), control(C), c(C,i1,Icur), c(C,i2,Idem), not c(C,i3,full), w_charge(psh,IMAXpc), Idem <= Icur, OP = 0, #int(OP). -c(C,o2,OP) :- not ab(C), control(C), c(C,i1,Icur), c(C,i2,Idem), not c(C,i3,full), w_charge(psh,IMAXpc), Idem <= Icur, OP = 0, #int(OP). -c(C,o3,OP) :- not ab(C), control(C), c(C,i1,Icur), c(C,i2,Idem), not c(C,i3,full), w_charge(psh,IMAXpc), Idem <= Icur, OP = 0, #int(OP). -c(C,o4,OP) :- not ab(C), control(C), c(C,i1,Icur), c(C,i2,Idem), not c(C,i3,full), w_charge(psh,IMAXpc), Idem <= Icur, OP = 2, #int(OP). -c(C,o5,OP) :- not ab(C), control(C), c(C,i1,Icur), c(C,i2,Idem), not c(C,i3,full), w_charge(psh,IMAXpc), Idem <= Icur, Tava = Icur - Idem, Tava <= IMAXpc, OP = Tava, #int(OP). -c(C,o5,OP) :- not ab(C), control(C), c(C,i1,Icur), c(C,i2,Idem), not c(C,i3,full), w_charge(psh,IMAXpc), Idem <= Icur, Tava = Icur - Idem, Tava > IMAXpc, OP = IMAXpc, #int(OP). +c(C,o1,OP) :- not ab(C), control(C), c(C,i1,Icur), c(C,i2,Idem), not c(C,i3,full), w_charge(IMAXpc), Idem <= Icur, OP = 0, #int(OP). +c(C,o2,OP) :- not ab(C), control(C), c(C,i1,Icur), c(C,i2,Idem), not c(C,i3,full), w_charge(IMAXpc), Idem <= Icur, OP = 0, #int(OP). +c(C,o3,OP) :- not ab(C), control(C), c(C,i1,Icur), c(C,i2,Idem), not c(C,i3,full), w_charge(IMAXpc), Idem <= Icur, OP = 0, #int(OP). +c(C,o4,OP) :- not ab(C), control(C), c(C,i1,Icur), c(C,i2,Idem), not c(C,i3,full), w_charge(IMAXpc), Idem <= Icur, OP = 2, #int(OP). +c(C,o5,OP) :- not ab(C), control(C), c(C,i1,Icur), c(C,i2,Idem), not c(C,i3,full), w_charge(IMAXpc), Idem <= Icur, Tava = Icur - Idem, Tava <= IMAXpc, OP = Tava, #int(OP). +c(C,o5,OP) :- not ab(C), control(C), c(C,i1,Icur), c(C,i2,Idem), not c(C,i3,full), w_charge(IMAXpc), Idem <= Icur, Tava = Icur - Idem, Tava > IMAXpc, OP = IMAXpc, #int(OP). % Produce energy. c(C,o4,OP) :- not ab(C), control(C), c(C,i1,Icur), c(C,i2,Idem), Idem > Icur, OP = 1, #int(OP). diff --git a/c.test1.dl b/c.test1.dl index 5dd6dde..b16f4d0 100644 --- a/c.test1.dl +++ b/c.test1.dl @@ -8,7 +8,7 @@ % The windmill w can only be used under certain circumstances; namely, when the wind speed (which is received on input i4) is between 5 and 40. % our plant's max values -c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(psh,30). +c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(30). control(c). diff --git a/c.test2.dl b/c.test2.dl index 79ca5b9..d0852ae 100644 --- a/c.test2.dl +++ b/c.test2.dl @@ -8,7 +8,7 @@ % The windmill w can only be used under certain circumstances; namely, when the wind speed (which is received on input i4) is between 5 and 40. % our plant's max values -c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(psh,30). +c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(30). control(c). diff --git a/c.test3.dl b/c.test3.dl index bd34f2e..493a769 100644 --- a/c.test3.dl +++ b/c.test3.dl @@ -8,7 +8,7 @@ % The windmill w can only be used under certain circumstances; namely, when the wind speed (which is received on input i4) is between 5 and 40. % our plant's max values -c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(psh,30). +c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(30). control(c). diff --git a/c.test4.dl b/c.test4.dl index 4dc027e..c1ef854 100644 --- a/c.test4.dl +++ b/c.test4.dl @@ -8,7 +8,7 @@ % The windmill w can only be used under certain circumstances; namely, when the wind speed (which is received on input i4) is between 5 and 40. % our plant's max values: min + max wind hardcoded (5-40) -c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(psh,30). +c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(30). control(c). diff --git a/c.test5.dl b/c.test5.dl index 2f80588..1b47189 100644 --- a/c.test5.dl +++ b/c.test5.dl @@ -8,7 +8,7 @@ % The windmill w can only be used under certain circumstances; namely, when the wind speed (which is received on input i4) is between 5 and 40. % our plant's max values: min + max wind hardcoded (5-40) -c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(psh,30). +c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(30). control(c). diff --git a/c.test6.dl b/c.test6.dl index 3333785..ffbe3e1 100644 --- a/c.test6.dl +++ b/c.test6.dl @@ -8,7 +8,7 @@ % The windmill w can only be used under certain circumstances; namely, when the wind speed (which is received on input i4) is between 5 and 40. % our plant's max values: min + max wind hardcoded (5-40) -c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(psh,30). +c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(30). control(c). diff --git a/c.test7.dl b/c.test7.dl index 480e1a5..e53b8ab 100644 --- a/c.test7.dl +++ b/c.test7.dl @@ -8,7 +8,7 @@ % The windmill w can only be used under certain circumstances; namely, when the wind speed (which is received on input i4) is between 5 and 40. % our plant's max values: min + max wind hardcoded (5-40) -c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(psh,30). +c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(30). control(c). diff --git a/c.test8.dl b/c.test8.dl index c872e37..932f207 100644 --- a/c.test8.dl +++ b/c.test8.dl @@ -8,7 +8,7 @@ % The windmill w can only be used under certain circumstances; namely, when the wind speed (which is received on input i4) is between 5 and 40. % our plant's max values: min + max wind hardcoded (5-40) -c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(psh,30). +c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(30). control(c). diff --git a/c.test9.dl b/c.test9.dl index 550bf5d..9093168 100644 --- a/c.test9.dl +++ b/c.test9.dl @@ -8,7 +8,7 @@ % The windmill w can only be used under certain circumstances; namely, when the wind speed (which is received on input i4) is between 5 and 40. % our plant's max values -c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(psh,30). +c_max(f,60). c_max(w,15). c_max(psh,20). w_charge(30). control(c). diff --git a/connect.dl b/connect.dl index 0b4e663..76a40e5 100644 --- a/connect.dl +++ b/connect.dl @@ -10,7 +10,7 @@ storage_plant(psh). c_max(f,60). c_max(w,15). c_max(psh,20). -w_charge(psh,30). +w_charge(30). % control c(c,i1,V) :- in_c(l_current,V). diff --git a/psh.dl b/psh.dl index f04aad0..a437b0c 100644 --- a/psh.dl +++ b/psh.dl @@ -16,10 +16,10 @@ p(C,op,OP) :- not ab(C), storage_plant(C), c(C,i1,0), p(C,i2,0), OP = 0, #int(OP p(C,op,OP) :- not ab(C), storage_plant(C), c(C,i1,charge), p(C,i2,I2), c(C,is,full), OP = I2, #int(OP). % over MAX charge -p(C,op,OP) :- not ab(C), storage_plant(C), c(C,i1,charge), p(C,i2,I2), w_charge(C,CMAX), not c(C,is,full), I2 > CMAX, OP = I2 - CMAX, #int(OP). +p(C,op,OP) :- not ab(C), storage_plant(C), c(C,i1,charge), p(C,i2,I2), w_charge(CMAX), not c(C,is,full), I2 > CMAX, OP = I2 - CMAX, #int(OP). % charge -p(C,op,OP) :- not ab(C), storage_plant(C), c(C,i1,charge), p(C,i2,I2), w_charge(C,CMAX), not c(C,is,full), I2 <= CMAX, OP = 0, #int(OP). +p(C,op,OP) :- not ab(C), storage_plant(C), c(C,i1,charge), p(C,i2,I2), w_charge(CMAX), not c(C,is,full), I2 <= CMAX, OP = 0, #int(OP). % normal discharge but empty % not charge but powered charger input diff --git a/psh.test1.dl b/psh.test1.dl index 2442120..717b8d3 100644 --- a/psh.test1.dl +++ b/psh.test1.dl @@ -9,7 +9,7 @@ storage_plant(psh). c_max(psh,20). % define max charging power -w_charge(psh,30). +w_charge(30). % define control i1 to 5KW (we request 5KW) c(psh,i1,5). diff --git a/psh.test2.dl b/psh.test2.dl index f54b8bf..15f3c89 100644 --- a/psh.test2.dl +++ b/psh.test2.dl @@ -9,7 +9,7 @@ storage_plant(psh). c_max(psh,20). % define max charging power -w_charge(psh,30). +w_charge(30). % define control i1 to 25KW (we request 25KW) c(psh,i1,25). diff --git a/psh.test3.dl b/psh.test3.dl index 8de7521..109c840 100644 --- a/psh.test3.dl +++ b/psh.test3.dl @@ -8,7 +8,7 @@ storage_plant(psh). c_max(psh,20). % define max charging power -w_charge(psh,30). +w_charge(30). % define control i1 to 0KW (we request 0KW) c(psh,i1,0). diff --git a/psh.test4.dl b/psh.test4.dl index 01385fb..fbca041 100644 --- a/psh.test4.dl +++ b/psh.test4.dl @@ -8,7 +8,7 @@ storage_plant(psh). c_max(psh,20). % define max charging power -w_charge(psh,30). +w_charge(30). % define control i1 to 5KW c(psh,i1,5). diff --git a/psh.test5.dl b/psh.test5.dl index 46a2a52..ce7e0ab 100644 --- a/psh.test5.dl +++ b/psh.test5.dl @@ -8,7 +8,7 @@ storage_plant(psh). c_max(psh,20). % define max charging power -w_charge(psh,30). +w_charge(30). % define control i1 to charge c(psh,i1,charge). diff --git a/psh.test6.dl b/psh.test6.dl index 0aa0896..0970aba 100644 --- a/psh.test6.dl +++ b/psh.test6.dl @@ -8,7 +8,7 @@ storage_plant(psh). c_max(psh,20). % define max charging power -w_charge(psh,30). +w_charge(30). % define control i1 to charge c(psh,i1,charge). diff --git a/psh.test7.dl b/psh.test7.dl index 03885c2..02fee5a 100644 --- a/psh.test7.dl +++ b/psh.test7.dl @@ -8,7 +8,7 @@ storage_plant(psh). c_max(psh,20). % define max charging power -w_charge(psh,30). +w_charge(30). % define control i1 to charge c(psh,i1,charge). diff --git a/psh.test8.dl b/psh.test8.dl index 49285b1..4f247da 100644 --- a/psh.test8.dl +++ b/psh.test8.dl @@ -9,7 +9,7 @@ storage_plant(psh). c_max(psh,20). % define max charging power -w_charge(psh,30). +w_charge(30). % define control i1 to 5KW (we request 5KW) c(psh,i1,5). -- 2.43.0