From 536a03b4ae3d4d9b35264858bf93b0b60d54c5d7 Mon Sep 17 00:00:00 2001 From: someone Date: Tue, 5 Jun 2012 13:32:42 +0200 Subject: [PATCH] c test updates --- c.test1.dl | 16 ++++++++-------- c.test2.dl | 16 ++++++++-------- c.test3.dl | 16 ++++++++-------- c.test4.dl | 16 ++++++++-------- c.test5.dl | 16 ++++++++-------- c.test6.dl | 2 +- c.test7.dl | 8 ++++---- 7 files changed, 45 insertions(+), 45 deletions(-) diff --git a/c.test1.dl b/c.test1.dl index c84b363..7ae5400 100644 --- a/c.test1.dl +++ b/c.test1.dl @@ -15,11 +15,11 @@ c_max(f,60). c_max(w,15). c_max(psh,20). charge_max(psh,30). control(c). -% define control i1/L_cur to 0KW -c(s,i1,0). +% define control i1/L_cur to 10KW +c(s,i1,10). -% define control i2/L_demand to 10KW -c(s,i2,10). +% define control i2/L_demand to 20KW +c(s,i2,20). % define control i3/Sstorage to half_full c(s,i3,half_full). @@ -29,11 +29,11 @@ c(s,i4,10). % test definition. -% expecting i1 to be 0 -expect_c(s,i1,0). +% expecting i1 to be 10 +expect_c(s,i1,10). -% expecting i2 to be 10 -expect_c(s,i2,10). +% expecting i2 to be 20 +expect_c(s,i2,20). % expecting i3 to be half_full expect_c(s,i3,half_full). diff --git a/c.test2.dl b/c.test2.dl index d50ec8a..651ced4 100644 --- a/c.test2.dl +++ b/c.test2.dl @@ -15,11 +15,11 @@ c_max(f,60). c_max(w,15). c_max(psh,20). charge_max(psh,30). control(c). -% define control i1/L_cur to 0KW -c(s,i1,0). +% define control i1/L_cur to 10KW +c(s,i1,10). -% define control i2/L_demand to 30KW -c(s,i2,30). +% define control i2/L_demand to 40KW +c(s,i2,40). % define control i3/Sstorage to half_full c(s,i3,half_full). @@ -29,11 +29,11 @@ c(s,i4,10). % test definition. -% expecting i1 to be 0 -expect_c(s,i1,0). +% expecting i1 to be 10 +expect_c(s,i1,10). -% expecting i2 to be 10 -expect_c(s,i2,10). +% expecting i2 to be 40 +expect_c(s,i2,40). % expecting i3 to be half_full expect_c(s,i3,half_full). diff --git a/c.test3.dl b/c.test3.dl index f1218a2..4210145 100644 --- a/c.test3.dl +++ b/c.test3.dl @@ -15,11 +15,11 @@ c_max(f,60). c_max(w,15). c_max(psh,20). charge_max(psh,30). control(c). -% define control i1/L_cur to 0KW -c(s,i1,0). +% define control i1/L_cur to 10KW +c(s,i1,10). -% define control i2/L_demand to 50KW -c(s,i2,50). +% define control i2/L_demand to 60KW +c(s,i2,60). % define control i3/Sstorage to half_full c(s,i3,half_full). @@ -29,11 +29,11 @@ c(s,i4,10). % test definition. -% expecting i1 to be 0 -expect_c(s,i1,0). +% expecting i1 to be 10 +expect_c(s,i1,10). -% expecting i2 to be 50 -expect_c(s,i2,50). +% expecting i2 to be 60 +expect_c(s,i2,60). % expecting i3 to be half_full expect_c(s,i3,half_full). diff --git a/c.test4.dl b/c.test4.dl index a2e453c..36ca838 100644 --- a/c.test4.dl +++ b/c.test4.dl @@ -15,11 +15,11 @@ c_max(f,60). c_max(w,15). c_max(psh,20). charge_max(psh,30). control(c). -% define control i1/L_cur to 0KW -c(s,i1,0). +% define control i1/L_cur to 10KW +c(s,i1,10). -% define control i2/L_demand to 50KW -c(s,i2,50). +% define control i2/L_demand to 60KW +c(s,i2,60). % define control i3/Sstorage to half_full c(s,i3,half_full). @@ -29,11 +29,11 @@ c(s,i4,50). % test definition. -% expecting i1 to be 0 -expect_c(s,i1,0). +% expecting i1 to be 10 +expect_c(s,i1,10). -% expecting i2 to be 50 -expect_c(s,i2,50). +% expecting i2 to be 60 +expect_c(s,i2,60). % expecting i3 to be half_full expect_c(s,i3,half_full). diff --git a/c.test5.dl b/c.test5.dl index d39627a..8d45b11 100644 --- a/c.test5.dl +++ b/c.test5.dl @@ -15,11 +15,11 @@ c_max(f,60). c_max(w,15). c_max(psh,20). charge_max(psh,30). control(c). -% define control i1/L_cur to 0KW -c(s,i1,0). +% define control i1/L_cur to 10KW +c(s,i1,10). -% define control i2/L_demand to 50KW -c(s,i2,50). +% define control i2/L_demand to 60KW +c(s,i2,60). % define control i3/Sstorage to empty c(s,i3,empty). @@ -29,11 +29,11 @@ c(s,i4,50). % test definition. -% expecting i1 to be 0 -expect_c(s,i1,0). +% expecting i1 to be 10 +expect_c(s,i1,10). -% expecting i2 to be 50 -expect_c(s,i2,50). +% expecting i2 to be 60 +expect_c(s,i2,60). % expecting i3 to be half_full expect_c(s,i3,empty). diff --git a/c.test6.dl b/c.test6.dl index 64a5e88..d6fcc78 100644 --- a/c.test6.dl +++ b/c.test6.dl @@ -18,7 +18,7 @@ control(c). % define control i1/L_cur to 20KW c(s,i1,20). -% define control i2/L_demand to 0KW +% define control i2/L_demand to 10KW c(s,i2,10). % define control i3/Sstorage to empty diff --git a/c.test7.dl b/c.test7.dl index 2316c77..fd074e8 100644 --- a/c.test7.dl +++ b/c.test7.dl @@ -15,11 +15,11 @@ c_max(f,60). c_max(w,15). c_max(psh,20). charge_max(psh,30). control(c). -% define control i1/L_cur to 0KW -c(s,i1,0). +% define control i1/L_cur to 10KW +c(s,i1,10). -% define control i2/L_demand to 0KW -c(s,i2,0). +% define control i2/L_demand to 10KW +c(s,i2,10). % define control i3/Sstorage to empty c(s,i3,empty). -- 2.43.0