From 5299ac1702b228d0efb16ec380237a334a1a9e3a Mon Sep 17 00:00:00 2001 From: someone Date: Fri, 8 Jun 2012 22:21:47 +0200 Subject: [PATCH] icontrol fix for testcase 15 --- c.dl | 2 +- c.test6.dl | 4 ++-- c.test8.dl | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/c.dl b/c.dl index 535c971..d755a3a 100644 --- a/c.dl +++ b/c.dl @@ -20,7 +20,7 @@ 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(IMAXpc), Idem <= Icur, OP = 0, #int(OP). +c(C,o1,charge) :- not ab(C), control(C), c(C,i1,Icur), c(C,i2,Idem), not c(C,i3,full), w_charge(IMAXpc), Idem <= Icur. 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). diff --git a/c.test6.dl b/c.test6.dl index ffbe3e1..aee2e45 100644 --- a/c.test6.dl +++ b/c.test6.dl @@ -38,8 +38,8 @@ expect_c(c,i3,half_full). % expecting i4 to be 0 expect_c(c,i4,0). -% and request 0KW -expect_c(c,o1,0). +% and set to charge +expect_c(c,o1,charge). % and request 0KW expect_c(c,o2,0). diff --git a/c.test8.dl b/c.test8.dl index 932f207..b4e6312 100644 --- a/c.test8.dl +++ b/c.test8.dl @@ -38,8 +38,8 @@ expect_c(c,i3,half_full). % expecting i4 to be 0 expect_c(c,i4,0). -% and request 0KW -expect_c(c,o1,0). +% and set to charge +expect_c(c,o1,charge). % and request 0KW expect_c(c,o2,0). -- 2.43.0