Skip to content

Commit e329de5

Browse files
GillisHommenGillisHommen
committed
Poging laadgedrag robuuster te maken
*Thuiskomen met 'negatieve lading' is toegestaan, zodat totale energiebehoefte wel in acht genomen wordt *De 'laad-planner' kijkt ook vast 1 trip vooruit, of er wel genoeg tijd is tussen de trips om bij te laden daarvoor
1 parent b2e402e commit e329de5

File tree

7 files changed

+246
-17
lines changed

7 files changed

+246
-17
lines changed

‎HeatingSystemModel/HeatingSystems.alp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
AnyLogic Project File
55
*************************************************
66
-->
7-
<AnyLogicWorkspace WorkspaceVersion="1.9" AnyLogicVersion="8.7.12.202205250339" AlpVersion="8.7.5">
7+
<AnyLogicWorkspace WorkspaceVersion="1.9" AnyLogicVersion="8.7.12.202205250418" AlpVersion="8.7.5">
88
<Model>
99
<Id>1648027099882</Id>
1010
<Name><![CDATA[HeatingSystems]]></Name>
@@ -2281,7 +2281,7 @@ v_DistrictHeatingAbsorbed_kWh += v_DistrictHeatingAbsorption_kW * timeStep_HR;]]
22812281
<Properties SaveInSnapshot="true" Constant="false" AccessType="public" StaticVariable="false">
22822282
<Type><![CDATA[double]]></Type>
22832283
<InitialValue Class="CodeValue">
2284-
<Code><![CDATA[(p_primarySystemMaxPower_kW > 0)? p_bufferStartTemp_degC : 50]]></Code>
2284+
<Code><![CDATA[(p_primarySystemMaxPower_kW > 0)? p_bufferStartTemp_degC : 60]]></Code>
22852285
</InitialValue>
22862286
</Properties>
22872287
</Variable>
@@ -2758,7 +2758,7 @@ v_DistrictHeatingAbsorbed_kWh += v_DistrictHeatingAbsorption_kW * timeStep_HR;]]
27582758
<ReturnType><![CDATA[double]]></ReturnType>
27592759
<Id>1650616556360</Id>
27602760
<Name><![CDATA[f_socUpdate]]></Name>
2761-
<X>30</X><Y>280</Y>
2761+
<X>480</X><Y>320</Y>
27622762
<Label><X>10</X><Y>0</Y></Label>
27632763
<PublicFlag>false</PublicFlag>
27642764
<PresentationFlag>true</PresentationFlag>

‎HeatingSystemModel/database/db.lck‎

0 Bytes
Binary file not shown.

‎HeatingSystemModel/database/db.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#HSQL Database Engine 2.4.1
2-
#Fri Jul 15 10:40:14 CEST 2022
2+
#Mon Jul 18 09:36:09 CEST 2022
33
tx_timestamp=0
44
modified=yes
55
version=2.4.1

‎models/Ebuurt.alp‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
AnyLogic Project File
55
*************************************************
66
-->
7-
<AnyLogicWorkspace WorkspaceVersion="1.9" AnyLogicVersion="8.7.12.202205250339" AlpVersion="8.7.5">
7+
<AnyLogicWorkspace WorkspaceVersion="1.9" AnyLogicVersion="8.7.12.202205250418" AlpVersion="8.7.5">
88
<Model>
99
<Id>1641891178629</Id>
1010
<Name><![CDATA[Ebuurt]]></Name>
@@ -1307,7 +1307,7 @@ traceln("On Startup end main " + this.getName()+" | "+System.currentTimeMillis()
13071307
<UnitType><![CDATA[NONE]]></UnitType>
13081308
<SdArray>false</SdArray>
13091309
<DefaultValue Class="CodeValue">
1310-
<Code><![CDATA[15/60.0]]></Code>
1310+
<Code><![CDATA[60/60.0]]></Code>
13111311
</DefaultValue>
13121312
<ParameterEditor>
13131313
<Id>1652790988352</Id>
@@ -1356,7 +1356,7 @@ traceln("On Startup end main " + this.getName()+" | "+System.currentTimeMillis()
13561356
<UnitType><![CDATA[NONE]]></UnitType>
13571357
<SdArray>false</SdArray>
13581358
<DefaultValue Class="CodeValue">
1359-
<Code><![CDATA[120]]></Code>
1359+
<Code><![CDATA[150]]></Code>
13601360
</DefaultValue>
13611361
<ParameterEditor>
13621362
<Id>1655393315502</Id>
@@ -1537,7 +1537,7 @@ Uses:
15371537
<UnitType><![CDATA[NONE]]></UnitType>
15381538
<SdArray>false</SdArray>
15391539
<DefaultValue Class="CodeValue">
1540-
<Code><![CDATA[3]]></Code>
1540+
<Code><![CDATA[2]]></Code>
15411541
</DefaultValue>
15421542
<ParameterEditor>
15431543
<Id>1655972623721</Id>
@@ -10162,6 +10162,7 @@ jaarlijksTotaalPVOpwekKWh += pvOpwekKW;]]></Action>
1016210162
<Event>
1016310163
<Id>1642002847867</Id>
1016410164
<Name><![CDATA[jaarlijksTotaal]]></Name>
10165+
<ExcludeFromBuild>true</ExcludeFromBuild>
1016510166
<X>60</X><Y>500</Y>
1016610167
<Label><X>10</X><Y>0</Y></Label>
1016710168
<PublicFlag>false</PublicFlag>
@@ -11269,8 +11270,8 @@ else {
1126911270
// Peter zegt: Waarom is dit nodig? Er kunnen toch geen duplicates in voorkomen?
1127011271
if (p_tripIndex + 1 < starttimes.size()) {
1127111272
p_tripIndex++;
11272-
}
11273-
//traceln("!! Ride with duplicate starttime skipped!! auto " + this.getIndex() + " in buurt " + eBuurtModel.getIndex());
11273+
traceln("!! Ride with duplicate starttime skipped!! auto " + this.getIndex() + " in buurt " + eBuurtModel.getIndex());
11274+
}
1127411275
}
1127511276
tripDistance_km = min(distances.get(p_tripIndex), maxBatterijCap_kWh / energieverbruik_kWhpkm);
1127611277
//Peter zegt: waarom min(), er kan toch worden snellgeladen als er niet genoeg kwh is?
@@ -11295,6 +11296,21 @@ else {
1129511296

1129611297
v_chargingTarget_kWh = min( maxBatterijCap_kWh, energyRequired_kWh + energyMargin_kWh);
1129711298
v_minChargingTime_min = max( 0 , ( v_chargingTarget_kWh - huidigBatterijCap_kWh ) / maxLaadsnelheid_kW * 60 );
11299+
11300+
if ( ( v_chargingTarget_kWh - huidigBatterijCap_kWh ) / maxLaadsnelheid_kW * 60 > starttimes.get(p_tripIndex) - time( MINUTE )) {
11301+
traceln("Not enough time to charge for next trip!");
11302+
}
11303+
11304+
// check if enough time to charge for the next trip! If not, raise charging target
11305+
double timebetweentrips_min = starttimes.get(p_tripIndex+1)-endtimes.get(p_tripIndex);
11306+
double energyReqNextTrip_kWh = min(distances.get(p_tripIndex+1) * energieverbruik_kWhpkm, maxBatterijCap_kWh);
11307+
if ( ( v_chargingTarget_kWh - distances.get(p_tripIndex) * energieverbruik_kWhpkm + timebetweentrips_min/60.0 * maxLaadsnelheid_kW ) < energyReqNextTrip_kWh) {
11308+
v_chargingTarget_kWh = energyReqNextTrip_kWh - timebetweentrips_min/60.0 * maxLaadsnelheid_kW + (distances.get(p_tripIndex) * energieverbruik_kWhpkm);
11309+
traceln("Increasing chargingTarget for next trip! Distance next trip is " + distances.get(p_tripIndex+1) + " km, charging time between trips is " + roundToInt(timebetweentrips_min) + " minutes");
11310+
if (v_chargingTarget_kWh > maxBatterijCap_kWh) {
11311+
traceln("Infeasible trip-set for this EV! Cannot charge enough between trips");
11312+
}
11313+
}
1129811314
}
1129911315

1130011316
// Determine if this car will wants to charge in basic charging sceanrio (used by reference case in stprint 6)
@@ -11320,13 +11336,13 @@ else if ( huidigBereik_km > 250 && huidigBereik_km < 400 && randomTrue( 0.1 ) )
1132011336
<ShowLabel>true</ShowLabel>
1132111337
<Body><![CDATA[// Bepaal SOC en huidig bereik
1132211338
if (elektrisch) {
11323-
huidigBatterijCap_kWh = max( 0, huidigBatterijCap_kWh - tripDistance_km * energieverbruik_kWhpkm );
11324-
if (huidigBatterijCap_kWh == 0) {
11325-
huidigBatterijCap_kWh = 0;
11339+
huidigBatterijCap_kWh = huidigBatterijCap_kWh - tripDistance_km * energieverbruik_kWhpkm; // laat negatieve batterijlading toe, zodat de gebruikte energie alsnog bijgeladen moet worden
11340+
if (huidigBatterijCap_kWh < 0) {
11341+
//huidigBatterijCap_kWh = 0;
1132611342
v_TimesArriveEmpty ++;
1132711343
traceln("!! Elektrische auto komt leeg thuis !! auto " + this.getIndex() + " in buurt " + eBuurtModel.getIndex());
1132811344
}
11329-
huidigBereik_km = huidigBatterijCap_kWh / energieverbruik_kWhpkm;
11345+
huidigBereik_km = max(0,huidigBatterijCap_kWh / energieverbruik_kWhpkm);
1133011346

1133111347
}
1133211348

@@ -43467,7 +43483,7 @@ else {
4346743483
</Parameters>
4346843484
<PresentationProperties>
4346943485
<EnableZoomAndPanning>true</EnableZoomAndPanning>
43470-
<ExecutionMode><![CDATA[realTimeScaled]]></ExecutionMode>
43486+
<ExecutionMode><![CDATA[virtualTime]]></ExecutionMode>
4347143487
<Title><![CDATA[Ebuurt : Simulation]]></Title>
4347243488
<EnableDeveloperPanel>true</EnableDeveloperPanel>
4347343489
<ShowDeveloperPanelOnStart>true</ShowDeveloperPanelOnStart>

‎models/database/db.lck‎

16 Bytes
Binary file not shown.

‎models/database/db.log‎

Lines changed: 213 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,213 @@
1+
/*C2*/SET SCHEMA PUBLIC
2+
CREATE TABLE IF NOT EXISTS AL_CONFIGURATION ( PROPERTY_NAME VARCHAR(255) NOT NULL UNIQUE , PROPERTY_VALUE LONGVARCHAR )
3+
CREATE TABLE IF NOT EXISTS AL_GROUPS ( GROUP_NAME VARCHAR(255) NOT NULL PRIMARY KEY , DESCRIPTION LONGVARCHAR )
4+
CREATE TABLE IF NOT EXISTS AL_TABLES ( TABLE_NAME VARCHAR(255) NOT NULL PRIMARY KEY , GROUP_NAME VARCHAR(255) , DESCRIPTION LONGVARCHAR )
5+
CREATE TABLE IF NOT EXISTS AL_CUSTOM_TYPE ( TABLE_NAME VARCHAR(255) , COLUMN_NAME VARCHAR(255) , TYPE VARCHAR(255) , NAME VARCHAR(255) )
6+
CREATE TABLE IF NOT EXISTS AL_VIEWS ( VIEW_NAME VARCHAR(255) NOT NULL UNIQUE , VIEW_DEFINITION LONGVARCHAR , IS_VALID BOOLEAN )
7+
CREATE TABLE IF NOT EXISTS AL_SELECTED_LOG_OBJECTS ( NAME VARCHAR(255) NOT NULL UNIQUE , TYPE VARCHAR(255) )
8+
CREATE TABLE IF NOT EXISTS AL_DB_OBJECTS ( NAME VARCHAR(255) NOT NULL UNIQUE , TYPE VARCHAR(255) , USAGE VARCHAR(255) )
9+
/*C3*/SET SCHEMA PUBLIC
10+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=58
11+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=59
12+
INSERT INTO DB_WIJKCONFIG VALUES(60,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
13+
INSERT INTO DB_WIJKCONFIG VALUES(61,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
14+
COMMIT
15+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=62
16+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=63
17+
INSERT INTO DB_HOLONCONFIG VALUES(64,1,'WindHolon',TRUE,TRUE,TRUE)
18+
INSERT INTO DB_HOLONCONFIG VALUES(65,2,'WarmteHolon',TRUE,TRUE,TRUE)
19+
COMMIT
20+
DISCONNECT
21+
/*C4*/SET SCHEMA PUBLIC
22+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=60
23+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=61
24+
INSERT INTO DB_WIJKCONFIG VALUES(62,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
25+
INSERT INTO DB_WIJKCONFIG VALUES(63,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
26+
COMMIT
27+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=64
28+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=65
29+
INSERT INTO DB_HOLONCONFIG VALUES(66,1,'WindHolon',TRUE,TRUE,TRUE)
30+
INSERT INTO DB_HOLONCONFIG VALUES(67,2,'WarmteHolon',TRUE,TRUE,TRUE)
31+
COMMIT
32+
DISCONNECT
33+
/*C5*/SET SCHEMA PUBLIC
34+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=62
35+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=63
36+
INSERT INTO DB_WIJKCONFIG VALUES(64,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
37+
INSERT INTO DB_WIJKCONFIG VALUES(65,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
38+
COMMIT
39+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=66
40+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=67
41+
INSERT INTO DB_HOLONCONFIG VALUES(68,1,'WindHolon',TRUE,TRUE,TRUE)
42+
INSERT INTO DB_HOLONCONFIG VALUES(69,2,'WarmteHolon',TRUE,TRUE,TRUE)
43+
COMMIT
44+
DISCONNECT
45+
/*C6*/SET SCHEMA PUBLIC
46+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=64
47+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=65
48+
INSERT INTO DB_WIJKCONFIG VALUES(66,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
49+
INSERT INTO DB_WIJKCONFIG VALUES(67,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
50+
COMMIT
51+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=68
52+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=69
53+
INSERT INTO DB_HOLONCONFIG VALUES(70,1,'WindHolon',TRUE,TRUE,TRUE)
54+
INSERT INTO DB_HOLONCONFIG VALUES(71,2,'WarmteHolon',TRUE,TRUE,TRUE)
55+
COMMIT
56+
DISCONNECT
57+
/*C7*/SET SCHEMA PUBLIC
58+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=66
59+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=67
60+
INSERT INTO DB_WIJKCONFIG VALUES(68,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
61+
INSERT INTO DB_WIJKCONFIG VALUES(69,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
62+
COMMIT
63+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=70
64+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=71
65+
INSERT INTO DB_HOLONCONFIG VALUES(72,1,'WindHolon',TRUE,TRUE,TRUE)
66+
INSERT INTO DB_HOLONCONFIG VALUES(73,2,'WarmteHolon',TRUE,TRUE,TRUE)
67+
COMMIT
68+
DISCONNECT
69+
/*C8*/SET SCHEMA PUBLIC
70+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=68
71+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=69
72+
INSERT INTO DB_WIJKCONFIG VALUES(70,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
73+
INSERT INTO DB_WIJKCONFIG VALUES(71,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
74+
COMMIT
75+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=72
76+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=73
77+
INSERT INTO DB_HOLONCONFIG VALUES(74,1,'WindHolon',TRUE,TRUE,TRUE)
78+
INSERT INTO DB_HOLONCONFIG VALUES(75,2,'WarmteHolon',TRUE,TRUE,TRUE)
79+
COMMIT
80+
DISCONNECT
81+
/*C9*/SET SCHEMA PUBLIC
82+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=70
83+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=71
84+
INSERT INTO DB_WIJKCONFIG VALUES(72,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
85+
INSERT INTO DB_WIJKCONFIG VALUES(73,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
86+
COMMIT
87+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=74
88+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=75
89+
INSERT INTO DB_HOLONCONFIG VALUES(76,1,'WindHolon',TRUE,TRUE,TRUE)
90+
INSERT INTO DB_HOLONCONFIG VALUES(77,2,'WarmteHolon',TRUE,TRUE,TRUE)
91+
COMMIT
92+
DISCONNECT
93+
/*C10*/SET SCHEMA PUBLIC
94+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=72
95+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=73
96+
INSERT INTO DB_WIJKCONFIG VALUES(74,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
97+
INSERT INTO DB_WIJKCONFIG VALUES(75,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
98+
COMMIT
99+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=76
100+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=77
101+
INSERT INTO DB_HOLONCONFIG VALUES(78,1,'WindHolon',TRUE,TRUE,TRUE)
102+
INSERT INTO DB_HOLONCONFIG VALUES(79,2,'WarmteHolon',TRUE,TRUE,TRUE)
103+
COMMIT
104+
DISCONNECT
105+
/*C11*/SET SCHEMA PUBLIC
106+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=74
107+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=75
108+
INSERT INTO DB_WIJKCONFIG VALUES(76,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
109+
INSERT INTO DB_WIJKCONFIG VALUES(77,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
110+
COMMIT
111+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=78
112+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=79
113+
INSERT INTO DB_HOLONCONFIG VALUES(80,1,'WindHolon',TRUE,TRUE,TRUE)
114+
INSERT INTO DB_HOLONCONFIG VALUES(81,2,'WarmteHolon',TRUE,TRUE,TRUE)
115+
COMMIT
116+
DISCONNECT
117+
/*C12*/SET SCHEMA PUBLIC
118+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=76
119+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=77
120+
INSERT INTO DB_WIJKCONFIG VALUES(78,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
121+
INSERT INTO DB_WIJKCONFIG VALUES(79,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
122+
COMMIT
123+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=80
124+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=81
125+
INSERT INTO DB_HOLONCONFIG VALUES(82,1,'WindHolon',TRUE,TRUE,TRUE)
126+
INSERT INTO DB_HOLONCONFIG VALUES(83,2,'WarmteHolon',TRUE,TRUE,TRUE)
127+
COMMIT
128+
DISCONNECT
129+
/*C13*/SET SCHEMA PUBLIC
130+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=78
131+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=79
132+
INSERT INTO DB_WIJKCONFIG VALUES(80,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
133+
INSERT INTO DB_WIJKCONFIG VALUES(81,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
134+
COMMIT
135+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=82
136+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=83
137+
INSERT INTO DB_HOLONCONFIG VALUES(84,1,'WindHolon',TRUE,TRUE,TRUE)
138+
INSERT INTO DB_HOLONCONFIG VALUES(85,2,'WarmteHolon',TRUE,TRUE,TRUE)
139+
COMMIT
140+
DISCONNECT
141+
/*C14*/SET SCHEMA PUBLIC
142+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=80
143+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=81
144+
INSERT INTO DB_WIJKCONFIG VALUES(82,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
145+
INSERT INTO DB_WIJKCONFIG VALUES(83,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
146+
COMMIT
147+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=84
148+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=85
149+
INSERT INTO DB_HOLONCONFIG VALUES(86,1,'WindHolon',TRUE,TRUE,TRUE)
150+
INSERT INTO DB_HOLONCONFIG VALUES(87,2,'WarmteHolon',TRUE,TRUE,TRUE)
151+
COMMIT
152+
DISCONNECT
153+
/*C15*/SET SCHEMA PUBLIC
154+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=82
155+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=83
156+
INSERT INTO DB_WIJKCONFIG VALUES(84,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
157+
INSERT INTO DB_WIJKCONFIG VALUES(85,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
158+
COMMIT
159+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=86
160+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=87
161+
INSERT INTO DB_HOLONCONFIG VALUES(88,1,'WindHolon',TRUE,TRUE,TRUE)
162+
INSERT INTO DB_HOLONCONFIG VALUES(89,2,'WarmteHolon',TRUE,TRUE,TRUE)
163+
COMMIT
164+
DISCONNECT
165+
/*C16*/SET SCHEMA PUBLIC
166+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=84
167+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=85
168+
INSERT INTO DB_WIJKCONFIG VALUES(86,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
169+
INSERT INTO DB_WIJKCONFIG VALUES(87,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
170+
COMMIT
171+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=88
172+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=89
173+
INSERT INTO DB_HOLONCONFIG VALUES(90,1,'WindHolon',TRUE,TRUE,TRUE)
174+
INSERT INTO DB_HOLONCONFIG VALUES(91,2,'WarmteHolon',TRUE,TRUE,TRUE)
175+
COMMIT
176+
DISCONNECT
177+
/*C17*/SET SCHEMA PUBLIC
178+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=86
179+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=87
180+
INSERT INTO DB_WIJKCONFIG VALUES(88,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
181+
INSERT INTO DB_WIJKCONFIG VALUES(89,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
182+
COMMIT
183+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=90
184+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=91
185+
INSERT INTO DB_HOLONCONFIG VALUES(92,1,'WindHolon',TRUE,TRUE,TRUE)
186+
INSERT INTO DB_HOLONCONFIG VALUES(93,2,'WarmteHolon',TRUE,TRUE,TRUE)
187+
COMMIT
188+
DISCONNECT
189+
/*C18*/SET SCHEMA PUBLIC
190+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=88
191+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=89
192+
INSERT INTO DB_WIJKCONFIG VALUES(90,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
193+
INSERT INTO DB_WIJKCONFIG VALUES(91,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
194+
COMMIT
195+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=92
196+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=93
197+
INSERT INTO DB_HOLONCONFIG VALUES(94,1,'WindHolon',TRUE,TRUE,TRUE)
198+
INSERT INTO DB_HOLONCONFIG VALUES(95,2,'WarmteHolon',TRUE,TRUE,TRUE)
199+
COMMIT
200+
DISCONNECT
201+
/*C19*/SET SCHEMA PUBLIC
202+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=90
203+
DELETE FROM DB_WIJKCONFIG WHERE AL_ID=91
204+
INSERT INTO DB_WIJKCONFIG VALUES(92,1,'Buurt A reguliere buurt',100,40,70,20,0,20,50,10,0,2,100,0,0,0,0,0)
205+
INSERT INTO DB_WIJKCONFIG VALUES(93,2,'Buurt B warmtenet',100,60,70,40,20,20,20,0,0,2,0,0,0,100,0,0)
206+
COMMIT
207+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=94
208+
DELETE FROM DB_HOLONCONFIG WHERE AL_ID=95
209+
INSERT INTO DB_HOLONCONFIG VALUES(96,1,'WindHolon',TRUE,TRUE,TRUE)
210+
INSERT INTO DB_HOLONCONFIG VALUES(97,2,'WarmteHolon',TRUE,TRUE,TRUE)
211+
COMMIT
212+
DISCONNECT
213+
/*C2*/DISCONNECT

‎models/database/db.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#HSQL Database Engine 2.4.1
2-
#Fri Jul 15 10:50:18 CEST 2022
2+
#Mon Jul 18 09:34:52 CEST 2022
33
tx_timestamp=0
4-
modified=no
4+
modified=yes
55
version=2.4.1

0 commit comments

Comments
 (0)