Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use data models #214

Open
wants to merge 224 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
224 commits
Select commit Hold shift + click to select a range
c574618
Define data model.
spahrenk May 10, 2024
3309964
Move member class definitions.
spahrenk May 11, 2024
7ea350e
Move member class definitions2.
spahrenk May 11, 2024
5aefd9f
Move tank members into class definition.
spahrenk May 12, 2024
58897e6
Builds.
spahrenk May 13, 2024
8701b60
Checking tests.
spahrenk May 13, 2024
63e5363
Chasing energy balance.
spahrenk May 13, 2024
27a930b
Fix unit tests.
spahrenk May 13, 2024
19b5d6f
Small regression diffs.
spahrenk May 13, 2024
1906e78
Fix AdjustVolume_sameU.
spahrenk May 13, 2024
5b229ac
Format.
spahrenk May 13, 2024
e8c532b
Full format.
spahrenk May 14, 2024
4319a2b
Fix courier initialization.
spahrenk May 14, 2024
f17cf00
Remove comma.
spahrenk May 14, 2024
1664a86
Remove courier from data_model.
spahrenk May 14, 2024
aeafcd4
Static courier in load-object.h.
spahrenk May 14, 2024
79f78c5
Override rsinstance destructors.
spahrenk May 14, 2024
f6b7ddf
Format.
spahrenk May 14, 2024
b609cb1
Initialize rstank.
spahrenk May 14, 2024
2616e4e
Format.
spahrenk May 14, 2024
df660dd
Problem loading objects.
spahrenk May 14, 2024
5e6cb14
Loads data model.
spahrenk May 15, 2024
42712f3
Revert absolute vs. differential temp.
spahrenk May 16, 2024
59292ef
Format.
spahrenk May 16, 2024
d0f71e9
Add heatsourcebase.
spahrenk May 16, 2024
10403e4
Make utility functions static members.
spahrenk May 16, 2024
fc445dd
Separate SoC and temp-base heating logic.
spahrenk May 18, 2024
5c3aa25
Fix heat_source_configuration structure.
spahrenk May 20, 2024
137d704
Enable performance points/maps.
spahrenk May 23, 2024
b12f908
Build HeatSource inits.
spahrenk May 24, 2024
784a627
Use HPWH::DefaultCourier.
spahrenk May 25, 2024
1ff389b
Initialize heating logics. Some issue with loading configurations.
spahrenk May 27, 2024
e633be5
Fix heating logic.
spahrenk May 28, 2024
76d8957
Correct standby-logic format.
spahrenk Jun 5, 2024
4b121f3
Loads json, but fails test run.
spahrenk Jun 6, 2024
24e31f1
Load tank parameters.
spahrenk Jun 6, 2024
5f972e6
Merge branch 'develop' into use-data-models
spahrenk Jun 6, 2024
4c6d066
Mend after merge.
spahrenk Jun 6, 2024
514ec10
Complete merge.
spahrenk Jun 6, 2024
7289fa5
Fix switch error.
spahrenk Jun 7, 2024
b9a6915
Format.
spahrenk Jun 7, 2024
4fe94fd
Allow unit specification in prototype.
spahrenk Jun 9, 2024
7f74e94
Create functions for export.
spahrenk Jun 9, 2024
2d2d9b1
Preset<-> JSON regression failure.
spahrenk Jun 10, 2024
83c4bb9
Generate code into cpp folder.
spahrenk Jun 17, 2024
386bbf5
Generate code using add-back-logger branch of lattice.
spahrenk Jun 18, 2024
ac1f94d
Begin separating objects.
spahrenk Jun 24, 2024
235e88b
Merge branch 'develop-cli' into use-data-models
spahrenk Jul 1, 2024
9f1972d
Enable run from JSON.
spahrenk Sep 3, 2024
e79f090
Include submodule; format.
spahrenk Sep 3, 2024
a07cf0d
Update data-model submodule.
spahrenk Sep 3, 2024
3a647db
Determine mixesOnDraw from mixBelowFractionOnDraw.
spahrenk Sep 3, 2024
7836682
Update data model.
spahrenk Sep 9, 2024
f4eaa3f
Apply lattice revisions.
spahrenk Sep 18, 2024
1840c6d
Ignore .pyc
spahrenk Sep 18, 2024
cb2e758
Simplify.
spahrenk Sep 18, 2024
54d15e3
Restore base classes.
spahrenk Sep 19, 2024
918403f
Update gen code.
spahrenk Sep 19, 2024
9be2697
Build data_model as module.
spahrenk Sep 19, 2024
1ba69b9
Init fittingsUA.
spahrenk Sep 23, 2024
2a5fa04
Fix mix flag.
spahrenk Sep 23, 2024
41c24f2
Format.
spahrenk Sep 23, 2024
7b50915
Various fixes.
spahrenk Sep 24, 2024
2d4c387
Improve export.
spahrenk Sep 25, 2024
68d2921
Fix Rheem2020Prem50 input.
spahrenk Sep 25, 2024
c257ae2
Format.
spahrenk Sep 25, 2024
7408da6
Move submodule.
spahrenk Sep 25, 2024
0ce4e0c
Set comparison type.
spahrenk Sep 25, 2024
6fd01de
Fix switch.
spahrenk Sep 25, 2024
6e36903
Revert submodule.
spahrenk Sep 25, 2024
c99894d
Fix grid units.
spahrenk Sep 25, 2024
0e6f02f
Add convert command.
spahrenk Sep 25, 2024
277afe7
Improve JSOn->rs.
spahrenk Sep 25, 2024
a6961c9
Format.
spahrenk Sep 25, 2024
26f458f
Export json.
spahrenk Sep 30, 2024
f76226d
Improve heating logic export.
spahrenk Oct 1, 2024
0311cfe
Improve heating_logic export.
spahrenk Oct 2, 2024
f355c17
Add bool set flag.
spahrenk Oct 2, 2024
ebc1011
Allow json input; fix logic dist.
spahrenk Oct 2, 2024
731b057
Write schema.
spahrenk Oct 2, 2024
893f3ba
Improve grid export.
spahrenk Oct 2, 2024
ac59329
Enable points->map conversion.
spahrenk Oct 3, 2024
a8b9cc3
Improve heatsource export.
spahrenk Oct 3, 2024
22d0cce
Generate Rheem json model.
spahrenk Oct 4, 2024
0a3a9ae
Format.
spahrenk Oct 4, 2024
ada94ec
Update hpwh-data-model
spahrenk Oct 6, 2024
f251abe
Gen code runs with minimal changes.
spahrenk Oct 6, 2024
a902717
Update gen code.
spahrenk Oct 7, 2024
3838239
Format.
spahrenk Oct 7, 2024
64d3469
Fix heating-logic initialize().
spahrenk Oct 7, 2024
7c24311
Add additional heat-source fields.
spahrenk Oct 7, 2024
f0db76f
Add more heat-source fields.
spahrenk Oct 7, 2024
3a469b0
Fix coil config export.
spahrenk Oct 9, 2024
b0690f9
Set interp/exterp methods.
spahrenk Oct 9, 2024
8d8b235
Fix mixes on draw.
spahrenk Oct 9, 2024
aac0cc8
Move generate script.
spahrenk Oct 10, 2024
c7a92a8
Adjust test for initialT; format.
spahrenk Oct 10, 2024
0712100
Fix JSON-to-JSON.
spahrenk Oct 10, 2024
f4cdb05
Fix fields; add models.
spahrenk Oct 10, 2024
15cdd31
regen code.
spahrenk Oct 10, 2024
6322359
Format.
spahrenk Oct 10, 2024
abb5885
Add JSON tests.
spahrenk Oct 10, 2024
a1ed77a
Simplify initFromJSON.
spahrenk Oct 10, 2024
088fb69
Set fixed_setpoint; reduce terms.
spahrenk Oct 11, 2024
8603986
Autosize grid from map.
spahrenk Oct 14, 2024
da9f34d
Enable custom output filename.
spahrenk Oct 14, 2024
5e31ee7
Refine sizing; export models.
spahrenk Oct 14, 2024
7504462
Format.
spahrenk Oct 14, 2024
e2a8aa8
Regenerate code; remove perf_points.
spahrenk Oct 14, 2024
0c9da68
Define model names.
spahrenk Oct 14, 2024
858a7ed
Define model map for consideration.
spahrenk Oct 14, 2024
466c2d1
Make HeatSources shared_ptrs.
spahrenk Oct 14, 2024
94eea89
Begin cleaving.
spahrenk Oct 14, 2024
d8bd994
Clarify scaling.
spahrenk Oct 15, 2024
bfc991b
Define empty fnc.
spahrenk Oct 15, 2024
a7db189
Clear-up logic.
spahrenk Oct 15, 2024
21e18ba
Restore changes.
spahrenk Oct 15, 2024
1a298f3
Address build errors.
spahrenk Oct 16, 2024
de3db67
Fix name.
spahrenk Oct 16, 2024
6fed5f5
Calc size constants after changing volume.
spahrenk Oct 16, 2024
d7e956c
Merge branch 'use-data-models' into cleave-heat-source-types
spahrenk Oct 16, 2024
b072aff
In progress.
spahrenk Oct 16, 2024
cc43388
Cleavage in progress.
spahrenk Oct 16, 2024
7020ec7
Define heat source types in separate files.
spahrenk Oct 17, 2024
2ad52be
Improve heat source separation.
spahrenk Oct 17, 2024
01c0262
Fix build errors.
spahrenk Oct 17, 2024
c5aa798
Initialize Condenser member vars.
spahrenk Oct 17, 2024
308f03f
Remove files; init isMultipass.
spahrenk Oct 17, 2024
14ff95e
Replace ref; remove unused refs.
spahrenk Oct 17, 2024
b575ef5
Move yearly tests to end.
spahrenk Oct 17, 2024
869a6a9
Make power private.
spahrenk Oct 17, 2024
1c2e3fa
Fix power units.
spahrenk Oct 17, 2024
fb1bebf
Fix merge error.
spahrenk Oct 23, 2024
c42476d
Merge branch 'develop' into use-data-models
spahrenk Oct 23, 2024
c6e656b
Fix merge.
spahrenk Oct 23, 2024
0370867
Replace 'standby' with 'top_node' when possible.
spahrenk Oct 23, 2024
a27b48c
Replace standby where suitable.
spahrenk Oct 23, 2024
039967d
Prep for heat_capacity.
spahrenk Oct 24, 2024
cb10d65
Move generated code to vendor.
spahrenk Oct 24, 2024
cfed4a4
Builds with code gen in-place.
spahrenk Oct 24, 2024
a072307
Replace hyphen in folder name.
spahrenk Oct 24, 2024
12993ae
Change for regen with fixed names.
spahrenk Oct 24, 2024
45dae16
Reorg; generate code from CMake.
spahrenk Oct 25, 2024
619f9e9
Move generation to vendor.
spahrenk Oct 25, 2024
0b9a877
Remove condition.
spahrenk Oct 25, 2024
d42e55b
Add event to await completion.
spahrenk Oct 25, 2024
11fbe85
Change workflow.
spahrenk Oct 25, 2024
009e017
Use add_custom_target.
spahrenk Oct 25, 2024
929b6dc
Use add_custom_command.
spahrenk Oct 25, 2024
6d75c56
Restore code during dev.
spahrenk Oct 26, 2024
f02b0d4
Merge branch 'use-data-models' into cleave-heat-source-types
spahrenk Oct 26, 2024
bde3be8
Retain data model src during dev.
spahrenk Oct 26, 2024
5aede2b
Retain code for dev.
spahrenk Oct 26, 2024
11660f6
Revert.
spahrenk Oct 26, 2024
93ebe68
Restore is_vip.
spahrenk Oct 27, 2024
211971d
Use primary_heat_source_id.
spahrenk Oct 28, 2024
3879553
Restore gen source.
spahrenk Oct 28, 2024
c92c2d8
Supress auto codegen.
spahrenk Oct 28, 2024
9dd707f
Adjust ranges for grid.
spahrenk Oct 28, 2024
ba9dacb
Merge branch 'develop' into use-data-models
spahrenk Oct 28, 2024
860fb77
Format.
spahrenk Oct 28, 2024
f93b6e7
Format.
spahrenk Oct 28, 2024
4ee0506
Organize tests.
spahrenk Oct 28, 2024
5007f9c
Restore dime version; change test order.
spahrenk Oct 28, 2024
47d8a7e
Attempt execute_process.
spahrenk Oct 28, 2024
8985c16
Test python 3.12.
spahrenk Oct 28, 2024
6e9bb23
Revert pyproject.toml; move plot test up.
spahrenk Oct 29, 2024
d3c61da
Remove auto codegen.
spahrenk Oct 29, 2024
089f167
Combine python configs.
spahrenk Oct 29, 2024
b723bb1
Remove plot test.
spahrenk Oct 29, 2024
2cb1ad9
Specify python ^3.10.
spahrenk Oct 29, 2024
3a1de7d
Try orig lattice config.
spahrenk Oct 29, 2024
e3518fa
Call submodule update.
spahrenk Oct 29, 2024
9e9cb57
Combine commands; change py version.
spahrenk Oct 29, 2024
accdbcc
Change poetry vers; speccify cache.
spahrenk Oct 30, 2024
d3e28f3
Remove cache; set poetry py version.
spahrenk Oct 30, 2024
cee37c9
Change version requirement.
spahrenk Oct 30, 2024
2c6a7cc
Expand build output.
spahrenk Oct 30, 2024
c83dd55
Prevent multiple poetry installs.
spahrenk Oct 30, 2024
f25eed3
Disable plot test.
spahrenk Oct 30, 2024
d4fd8ca
Merge branch 'use-data-models' into cleave-heat-source-types
spahrenk Oct 30, 2024
06fc679
Merge use-data-models.
spahrenk Oct 31, 2024
69d6af1
Remove cache variable initialization.
spahrenk Nov 4, 2024
28f9e95
Enable file->json.
spahrenk Nov 5, 2024
5101cf5
Restore Files; improve file->json.
spahrenk Nov 6, 2024
8b617a8
Init model from File via JSON.
spahrenk Nov 6, 2024
c372a4d
Restore verbosity to hide warning.
spahrenk Nov 6, 2024
86e6fe5
Fix file init.
spahrenk Nov 7, 2024
855cde6
Split initFromFile.
spahrenk Nov 7, 2024
46f9068
Set logic description.
spahrenk Nov 7, 2024
43575f3
Init condenser temps.
spahrenk Nov 7, 2024
2be4504
Restore yearly tests; format.
spahrenk Nov 7, 2024
cab9e97
Restore execute_process.
spahrenk Nov 7, 2024
c974bc2
Merge cleave-hs-types; fix type conversion.
spahrenk Nov 7, 2024
1484ef1
Create seprate poetry folders.
spahrenk Nov 7, 2024
a1e0ac9
Restore plot test.
spahrenk Nov 8, 2024
8a3cbc7
Improce cmake codegen conditioms/reporting.
spahrenk Nov 8, 2024
0215847
Use RESULT.
spahrenk Nov 8, 2024
d3f6b14
Move gencode to build dir.
spahrenk Nov 13, 2024
cbdb8d2
Enforce T limits.
spahrenk Nov 27, 2024
f824d6c
Merge remote-tracking branch 'origin/main' into use-data-models
spahrenk Nov 27, 2024
f2fee0b
Merge remote-tracking branch 'origin/main' into use-data-models
spahrenk Nov 27, 2024
a601740
Move tests.
spahrenk Nov 27, 2024
f0eccdb
Organize tests.
spahrenk Nov 27, 2024
cdd1285
Restore File spec.
spahrenk Dec 2, 2024
a818642
Update CMakeLists.
spahrenk Dec 2, 2024
deab24e
Remove resistance hysteresis, etc.
spahrenk Dec 2, 2024
1369eb6
Improve lock-put logic.
spahrenk Dec 3, 2024
9c93ea6
Repair backup logic.
spahrenk Dec 3, 2024
92988f5
Update json models.
spahrenk Dec 3, 2024
fb7c586
Restore poetry; format.
spahrenk Dec 3, 2024
faf7937
Restore plot poetry.
spahrenk Dec 3, 2024
15fd3e8
Change to int.
spahrenk Dec 3, 2024
58060f6
Restore plot poetry; move plot test.
spahrenk Dec 3, 2024
a8bcab0
Retry restore plot poetry.
spahrenk Dec 3, 2024
fc8673d
Correct type conversion.
spahrenk Dec 3, 2024
0feffdf
Improve perfmap export.
spahrenk Dec 4, 2024
9771258
Update perfmaps; fix test list.
spahrenk Dec 9, 2024
13faeca
Derive coeffs inline.
spahrenk Dec 9, 2024
2381e36
Adjusted perf coeffs.
spahrenk Dec 10, 2024
bd055b3
Merge remote-tracking branch 'origin/constrain-perf-curves-add-lg' in…
spahrenk Dec 10, 2024
02c3d4e
Add LG 80-gal.
spahrenk Dec 11, 2024
1ea3fb6
Creat json; change refs.
spahrenk Dec 11, 2024
a68a2f5
Merge branch 'main' into use-data-models
spahrenk Jan 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Restore plot poetry.
spahrenk committed Dec 3, 2024
commit faf79375666e086b10eb8cc75b328f09f5165f6f
780 changes: 636 additions & 144 deletions scripts/python/plotting/poetry.lock

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion scripts/python/plotting/pyproject.toml
Original file line number Diff line number Diff line change
@@ -5,11 +5,15 @@ description = ""
authors = []

[tool.poetry.dependencies]
python = "^3.8"
python = "^3.10"
pandas = "*"
plotly = "*"
koozie = "*"
dimes = { git = "https://github.com/bigladder/dimes" }
dash = "^2.18.2"
promptlib = "^1.0.0"
psutil = "^6.1.0"
numpy = "^1.26.3"

[build-system]
requires = ["poetry-core>=1.0.0"]