Skip to content

Commit 2ecc3ef

Browse files
malamalcamalamalca
authored
Merge pull request #1 from malamalca/TSS
Sprememba sistema TSS
2 parents 8f32dcd + 87cec37 commit 2ecc3ef

32 files changed

+1143
-347
lines changed

‎config/bootstrap.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ function echo_exception_handler($e) {
3434
if (Configure::read('debug')) {
3535
error_reporting(E_ALL);
3636
ini_set('display_errors', true);
37-
set_exception_handler('echo_exception_handler');
37+
// set_exception_handler('echo_exception_handler');
3838
}
3939

4040

4141
// Handle php error logs with monolog
4242
$logger = Log::getInstance()->getLogger();
43-
ErrorHandler::register($logger);
43+
//ErrorHandler::register($logger);
4444

4545
/**
4646
* Set server timezone to UTC. You can change it to another timezone of your

‎config/funcs.php‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,38 @@ function ar($a) {
3535
return '|' . implode(' | ', array_map(fn($v) => str_pad(number_format(round($v, 2), 2, '.', ''), 8, ' ', STR_PAD_LEFT), $a)) . '|' . PHP_EOL;
3636
}
3737

38+
/**
39+
* Array sum values
40+
*
41+
* @param array &$a Destination array
42+
* @param array $b Array of elements to be sumed to $a
43+
* @return array
44+
*/
45+
function array_sum_values(&$a, $b) {
46+
$ret = $a;
47+
foreach ($b as $k => $v) {
48+
$ret[$k] = ($ret[$k] ?? 0) + $v;
49+
}
50+
51+
return $ret;
52+
}
53+
54+
/**
55+
* Array subtract values
56+
*
57+
* @param array &$a Destination array
58+
* @param array $b Array of elements to be subtracted from $a
59+
* @return array
60+
*/
61+
function array_subtract_values(&$a, $b) {
62+
$ret = $a;
63+
foreach ($b as $k => $v) {
64+
$ret[$k] = ($ret[$k] ?? 0) - $v;
65+
}
66+
67+
return $ret;
68+
}
69+
3870
/**
3971
* Return the first element in an array passing a given truth test.
4072
*

‎projects/TestniProjekt/podatki/TSS/ogrevanje.json‎

Lines changed: 43 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,24 @@
44
"idCone": "Cona1",
55
"vrsta": "toplovodni",
66
"energent": "elektrika",
7-
"rezim": "40/30",
7+
8+
"ogrevanje": {
9+
"rezim": "40/30",
10+
"generatorji": ["TC"],
11+
"razvodi": ["ogrevanje"],
12+
"prenosniki": ["TALNO"]
13+
},
14+
"tsv": {
15+
"rezim": "55/45",
16+
"generatorji": ["TC"],
17+
"razvodi": ["TSV"],
18+
"hranilniki": ["TSV"]
19+
},
20+
"_hlajenje": {
21+
"generatorji": ["TC"],
22+
"razvodi": ["ogrevanje"],
23+
"prenosniki": ["TALNO"]
24+
},
825

926
"generatorji": [
1027
{
@@ -17,22 +34,6 @@
1734
}
1835
],
1936

20-
"prenosniki": [
21-
{
22-
"id": "TALNO",
23-
"vrsta": "ploskovnaOgrevala",
24-
25-
"sistem": "talno_mokri",
26-
"izolacija": "100%",
27-
28-
"hidravlicnoUravnotezenje": "staticnoDviznihVodov",
29-
"regulacijaTemperature": "referencniProstor",
30-
31-
"mocRegulatorja": 1,
32-
"steviloRegulatorjev": 1
33-
}
34-
],
35-
3637
"razvodi": [
3738
{
3839
"vrsta": "dvocevni",
@@ -47,49 +48,44 @@
4748
},
4849
"ceviPrikljucniVodi": {
4950
}
51+
},
52+
{
53+
"vrsta": "toplavoda",
54+
"id": "TSV",
55+
"crpalka": {},
56+
"ceviHorizontaliVodi": {
57+
},
58+
"ceviDvizniVodi": {
59+
},
60+
"ceviPrikljucniVodi": {
61+
}
5062
}
51-
]
52-
},
53-
{
54-
"id": "STV",
55-
"idCone": "Cona1",
56-
"vrsta": "toplovodni",
57-
"energent": "elektrika",
58-
"rezim": "55/45",
59-
"namen": "TSV",
63+
],
6064

61-
"generatorji": [
65+
"prenosniki": [
6266
{
63-
"id": "TC",
64-
"vrsta": "TC_zrakvodaSTV",
65-
"nazivnaMoc": 6,
66-
"nazivniCOP": 3,
67-
"elektricnaMocNaPrimarnemKrogu": 6,
68-
"elektricnaMocNaSekundarnemKrogu": 6
67+
"id": "TALNO",
68+
"vrsta": "ploskovnaOgrevala",
69+
70+
"sistem": "talno_mokri",
71+
"izolacija": "100%",
72+
73+
"hidravlicnoUravnotezenje": "staticnoDviznihVodov",
74+
"regulacijaTemperature": "referencniProstor",
75+
76+
"mocRegulatorja": 1,
77+
"steviloRegulatorjev": 1
6978
}
7079
],
7180

7281
"hranilniki": [
7382
{
83+
"id": "TSV",
7484
"vrsta": "posrednoOgrevan",
7585
"volumen": 250,
7686
"istiProstorKotGrelnik": true,
7787
"vOgrevanemProstoru": true
7888
}
79-
],
80-
81-
"razvodi": [
82-
{
83-
"vrsta": "toplavoda",
84-
"id": "TSV",
85-
"crpalka": {},
86-
"ceviHorizontaliVodi": {
87-
},
88-
"ceviDvizniVodi": {
89-
},
90-
"ceviPrikljucniVodi": {
91-
}
92-
}
9389
]
9490
}
9591
]

‎src/Calc/TSS/EnergentFactory.php‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎src/Calc/TSS/Energenti/Elektrika.php‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎src/Calc/TSS/Energenti/Energent.php‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/Calc/TSS/Generatorji/Generator.php‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ abstract class Generator
99

1010
public float $nazivnaMoc;
1111

12-
public array $toplotneIzgube;
12+
public array $vneseneIzgube;
1313
public array $potrebnaEnergija;
1414
public array $potrebnaElektricnaEnergija;
1515
public array $obnovljivaEnergija;
16+
public array $vracljiveIzgube;
1617

1718
/**
1819
* Class Constructor
@@ -44,16 +45,33 @@ public function parseConfig($config)
4445
}
4546

4647
/**
47-
* Izračun toplotnih izgub
48+
* Analiza podsistema
49+
*
50+
* @param array $potrebnaEnergija Potrebna energija predhodnih TSS
51+
* @param \App\Calc\TSS\OgrevalniSistemi\OgrevalniSistem $sistem Podatki sistema
52+
* @param \stdClass $cona Podatki cone
53+
* @param \stdClass $okolje Podatki okolja
54+
* @param array $params Dodatni parametri za izračun
55+
* @return void
56+
*/
57+
public function analiza($potrebnaEnergija, $sistem, $cona, $okolje, $params = [])
58+
{
59+
$this->potrebnaEnergija($potrebnaEnergija, $sistem, $cona, $okolje, $params);
60+
$this->potrebnaElektricnaEnergija($potrebnaEnergija, $sistem, $cona, $okolje, $params);
61+
$this->obnovljivaEnergija($potrebnaEnergija, $sistem, $cona, $okolje, $params);
62+
}
63+
64+
/**
65+
* Izračun potrebne energije
4866
*
4967
* @param array $vneseneIzgube Vnešene izgube predhodnih TSS
5068
* @param \App\Calc\TSS\OgrevalniSistemi\OgrevalniSistem $sistem Podatki sistema
5169
* @param \stdClass $cona Podatki cone
5270
* @param \stdClass $okolje Podatki okolja
5371
* @param array $params Dodatni parametri za izračun
54-
* @return array
72+
* @return void
5573
*/
56-
abstract public function toplotneIzgube($vneseneIzgube, $sistem, $cona, $okolje, $params = []);
74+
abstract public function potrebnaEnergija($vneseneIzgube, $sistem, $cona, $okolje, $params = []);
5775

5876
/**
5977
* Izračun potrebne električne energije
@@ -63,7 +81,7 @@ abstract public function toplotneIzgube($vneseneIzgube, $sistem, $cona, $okolje,
6381
* @param \stdClass $cona Podatki cone
6482
* @param \stdClass $okolje Podatki okolja
6583
* @param array $params Dodatni parametri za izračun
66-
* @return array
84+
* @return void
6785
*/
6886
abstract public function potrebnaElektricnaEnergija($vneseneIzgube, $sistem, $cona, $okolje, $params = []);
6987

@@ -75,7 +93,7 @@ abstract public function potrebnaElektricnaEnergija($vneseneIzgube, $sistem, $co
7593
* @param \stdClass $cona Podatki cone
7694
* @param \stdClass $okolje Podatki okolja
7795
* @param array $params Dodatni parametri za izračun
78-
* @return array
96+
* @return void
7997
*/
8098
abstract public function obnovljivaEnergija($vneseneIzgube, $sistem, $cona, $okolje, $params = []);
8199
}

0 commit comments

Comments
 (0)