diff --git a/CHANGELOG.md b/CHANGELOG.md index b74b613..4b2461f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,20 @@ ## Unreleased +## [1.2.0] - 2026-08-13 + +### Added + +- 計算完了後に、暖房・冷房別の一次エネルギー消費量、未処理負荷、エアコン消費電力量、 + ファン消費電力量を年間値と単位付きのカードで表示するようにした。 + +### Changed + +- 入力画面を開いた直後は、①・②を含むすべての入力セクションを閉じた状態にした。 +- 計算ログを、計算条件、実行処理、年間結果、出力ファイル、計算エンジン詳細ログの + 5区分に整理した。再計算開始時には前回の年間結果を消去し、完了後に新しい結果へ + 更新するようにした。 + ## [1.1.2] - 2026-08-12 ### Changed diff --git a/README.md b/README.md index 9a3df3d..950db9f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ## 公開Web版 -**[Verification Platform Next ver.1.1.2をブラウザで開く](https://verification-platform-next-dnoeszca4a-an.a.run.app/)** +**[Verification Platform Next ver.1.2.0をブラウザで開く](https://verification-platform-next-dnoeszca4a-an.a.run.app/)** 公開Web版では、インストールせずに入力、計算、結果ファイルの取得を行えます。 計算は1件ずつ処理するため、混雑時は画面に表示される順番をお待ちください。 @@ -12,7 +12,7 @@ データはアップロードしないでください。 住宅の省エネルギー性能を検証するための計算エンジン、入力スキーマ、Gradio UIを -まとめたPythonモノレポです。正式版は **ver.1.1.2** です。 +まとめたPythonモノレポです。正式版は **ver.1.2.0** です。 本リポジトリは、建築研究所が公開する住宅のエネルギー消費性能計算プログラム `pyhees`を基礎とし、検証用の入力画面、床下空調などの拡張計算、数値回帰試験を @@ -23,7 +23,7 @@ - 223項目の正規入力スキーマと方式別の表示・検証条件 - JSON入力とGradio Web UI - ダクト式セントラル空調、ルームエアコン、床下空調などの計算 -- 暖冷房結果、8760時間系列、グラフ、計算ログの出力 +- 暖冷房別の年間結果、8760時間系列、グラフ、計算ログの出力 - 製品版、ソースコミット、上流`pyhees`、入力SHA-256を記録するマニフェスト - 旧版との代表ケース比較を行うPhase 5数値回帰 - Google Colabおよび任意のCloud Runデプロイ diff --git a/apps/gradio/pyproject.toml b/apps/gradio/pyproject.toml index f10a222..a69fdf1 100644 --- a/apps/gradio/pyproject.toml +++ b/apps/gradio/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "verification-platform-app" -version = "1.1.2" +version = "1.2.0" description = "Gradio application for Verification Platform" authors = ["iguchi-lab"] packages = [{ include = "verification_app", from = "src" }] diff --git a/docs/RELEASING.md b/docs/RELEASING.md index 86b9bf4..b928cbc 100644 --- a/docs/RELEASING.md +++ b/docs/RELEASING.md @@ -5,28 +5,28 @@ Verification Platform Nextは、製品全体を1つの [Semantic Versioning](https://semver.org/) で管理します。 -- Pythonパッケージ版: `1.1.2` -- 表示名: `ver.1.1.2` -- Gitタグ: `v1.1.2` -- 成果物接尾辞: `_v1.1.2` +- Pythonパッケージ版: `1.2.0` +- 表示名: `ver.1.2.0` +- Gitタグ: `v1.2.0` +- 成果物接尾辞: `_v1.2.0` 製品版の正本は `packages/pyhees-jjj/src/jjjexperiment/release.py`です。ルート、 `verification-core`、Gradioアプリ、`pyhees-jjj`の各`pyproject.toml`は 同じ版にそろえ、契約テストで不一致を検出します。 -日付は版番号として使いません。パッチ修正は`1.1.2`、後方互換な機能追加は -`1.2.0`、互換性を破る変更は`2.0.0`とします。 +日付は版番号として使いません。パッチ修正は`1.2.1`、後方互換な機能追加は +`1.3.0`、互換性を破る変更は`2.0.0`とします。 ## 計算成果物の追跡 成果物名には安定した版接尾辞を付けます。 ```text -_v1.1.2_input.json -_v1.1.2_output1.csv -_v1.1.2_output2.csv -_v1.1.2_manifest.json +_v1.2.0_input.json +_v1.2.0_output1.csv +_v1.2.0_output2.csv +_v1.2.0_manifest.json ``` 計算が正常終了すると、マニフェストへ次を記録します。 @@ -67,9 +67,9 @@ GitHub Actionsがすべて成功した後、PRをマージし、マージコミ ```bash git switch main git pull --ff-only -git tag -a v1.1.2 -m "Verification Platform Next ver.1.1.2" -git push origin v1.1.2 -gh release create v1.1.2 --title "Verification Platform Next ver.1.1.2" +git tag -a v1.2.0 -m "Verification Platform Next ver.1.2.0" +git push origin v1.2.0 +gh release create v1.2.0 --title "Verification Platform Next ver.1.2.0" ``` GitHub Releaseには`CHANGELOG.md`の該当版、試験結果、既知の制約を記載します。 diff --git a/docs/calculation_differences.md b/docs/calculation_differences.md index 94b1c9f..2c38c27 100644 --- a/docs/calculation_differences.md +++ b/docs/calculation_differences.md @@ -20,7 +20,7 @@ Verification Platform Nextは、建築研究所等の技術的協力のもと公 | --- | --- | | 建研本家 | `BRI-EES-House/pyhees` Ver.3.10、commit `d5224c4a01def00a8421bcd2fcc0d4b4a5b88644` | | 旧Verification Platform | Next移行時の基準commit `0f91ba8381df1b4960557b92b39339385cc9009f` | -| Verification Platform Next | ver.1.1.2、入力仕様 `260812` | +| Verification Platform Next | ver.1.2.0、入力仕様 `260812` | 建研本家の版は[`packages/pyhees-jjj/UPSTREAM.md`](../packages/pyhees-jjj/UPSTREAM.md)、 Nextの製品版は[`jjjexperiment/release.py`](../packages/pyhees-jjj/src/jjjexperiment/release.py) diff --git a/packages/pyhees-jjj/UPSTREAM.md b/packages/pyhees-jjj/UPSTREAM.md index de5a313..39da3ee 100644 --- a/packages/pyhees-jjj/UPSTREAM.md +++ b/packages/pyhees-jjj/UPSTREAM.md @@ -16,7 +16,7 @@ - upstream commit: `d5224c4a01def00a8421bcd2fcc0d4b4a5b88644` - previous upstream commit: `2de59208427e719edacfeffaa47d46e964c4fc63`(Ver.3.9相当) - imported fork commit: `0f91ba8381df1b4960557b92b39339385cc9009f` -- engine version: `_v1.1.2` +- engine version: `_v1.2.0` - legacy form version: `260715` この値は `regression/phase5/manifest.json` と一致させます。 diff --git a/packages/pyhees-jjj/pyproject.toml b/packages/pyhees-jjj/pyproject.toml index 7db28e2..c13b8d5 100644 --- a/packages/pyhees-jjj/pyproject.toml +++ b/packages/pyhees-jjj/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "pyhees-jjj" -version = "1.1.2" +version = "1.2.0" description = "Pyheesの検証用のフォークプロジェクトです" homepage = "https://github.com/izumi-system-development/pyhees-jjj" authors = ["Pyhees Development Team"] diff --git a/packages/pyhees-jjj/src/jjjexperiment/release.py b/packages/pyhees-jjj/src/jjjexperiment/release.py index 3d98730..e2f4d83 100644 --- a/packages/pyhees-jjj/src/jjjexperiment/release.py +++ b/packages/pyhees-jjj/src/jjjexperiment/release.py @@ -11,10 +11,10 @@ from typing import Any, Mapping -VERSION = "1.1.2" -DISPLAY_VERSION = "ver.1.1.2" -RELEASE_DATE = "2026-08-12" -ARTIFACT_VERSION = "_v1.1.2" +VERSION = "1.2.0" +DISPLAY_VERSION = "ver.1.2.0" +RELEASE_DATE = "2026-08-13" +ARTIFACT_VERSION = "_v1.2.0" UPSTREAM_PYHEES_VERSION = "3.10.0" UPSTREAM_PYHEES_COMMIT = "d5224c4a01def00a8421bcd2fcc0d4b4a5b88644" diff --git a/packages/pyhees-jjj/src/tests/test_release.py b/packages/pyhees-jjj/src/tests/test_release.py index 15bc5a1..dc4f8d9 100644 --- a/packages/pyhees-jjj/src/tests/test_release.py +++ b/packages/pyhees-jjj/src/tests/test_release.py @@ -22,7 +22,7 @@ def test_source_commit_prefers_deployment_metadata(monkeypatch): def test_write_artifact_manifest_records_release_and_input(tmp_path, monkeypatch): monkeypatch.setenv("VERIFICATION_SOURCE_COMMIT", "0123456789abcdef") input_data = {"case_name": "case", "region": 6} - path = tmp_path / "case_v1.1.2_manifest.json" + path = tmp_path / "case_v1.2.0_manifest.json" release.write_artifact_manifest(path, input_data) @@ -30,10 +30,10 @@ def test_write_artifact_manifest_records_release_and_input(tmp_path, monkeypatch assert manifest == { "schema_version": 1, "product": "Verification Platform Next", - "version": "1.1.2", - "display_version": "ver.1.1.2", - "release_date": "2026-08-12", - "artifact_version": "_v1.1.2", + "version": "1.2.0", + "display_version": "ver.1.2.0", + "release_date": "2026-08-13", + "artifact_version": "_v1.2.0", "source_commit": "0123456789abcdef", "upstream_pyhees_version": "3.10.0", "upstream_pyhees_commit": "d5224c4a01def00a8421bcd2fcc0d4b4a5b88644", @@ -82,7 +82,7 @@ def test_calc_writes_manifest_only_after_success(tmp_path, monkeypatch): assert actual is result assert json.loads( - (tmp_path / "release-case_v1.1.2_input.json").read_text(encoding="utf-8") + (tmp_path / "release-case_v1.2.0_input.json").read_text(encoding="utf-8") ) == input_data assert events == [ ("constants", input_data), @@ -90,7 +90,7 @@ def test_calc_writes_manifest_only_after_success(tmp_path, monkeypatch): ("calculate", experiment_main.calc_main), ( "manifest", - Path("release-case_v1.1.2_manifest.json"), + Path("release-case_v1.2.0_manifest.json"), input_data, ), ] diff --git a/packages/verification-core/pyproject.toml b/packages/verification-core/pyproject.toml index d05fd8c..1b88150 100644 --- a/packages/verification-core/pyproject.toml +++ b/packages/verification-core/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "verification-core" -version = "1.1.2" +version = "1.2.0" description = "Canonical input schema and shared contracts for Verification Platform" authors = ["iguchi-lab"] packages = [{ include = "verification_core", from = "src" }] diff --git a/pyproject.toml b/pyproject.toml index ad5ccce..6572f47 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "verification-platform-next" -version = "1.1.2" +version = "1.2.0" description = "Monorepo for the Verification Platform engine, schema, and UI" authors = ["iguchi-lab"] package-mode = false diff --git a/regression/phase5/manifest.json b/regression/phase5/manifest.json index c8aa592..8a56ff1 100644 --- a/regression/phase5/manifest.json +++ b/regression/phase5/manifest.json @@ -2,7 +2,7 @@ "schema_version": 1, "legacy_form_version": "260715", "engine_commit": "d5224c4a01def00a8421bcd2fcc0d4b4a5b88644", - "engine_version": "_v1.1.2", + "engine_version": "_v1.2.0", "tolerances": { "relative": 1e-09, "absolute": 1e-08 diff --git a/tests/test_gradio_app.py b/tests/test_gradio_app.py index 313ccda..145a8fc 100644 --- a/tests/test_gradio_app.py +++ b/tests/test_gradio_app.py @@ -66,7 +66,7 @@ def equipment_section(prefix: str) -> dict[str, object]: ) assert gradio.__version__.startswith("6.") - assert config["title"] == "Verification Platform Next ver.1.1.2" + assert config["title"] == "Verification Platform Next ver.1.2.0" assert component_types["accordion"] == 16 assert component_types["number"] == 156 assert component_types["dropdown"] == 54 diff --git a/tests/test_release_version.py b/tests/test_release_version.py index 04b6572..d41e84b 100644 --- a/tests/test_release_version.py +++ b/tests/test_release_version.py @@ -13,9 +13,9 @@ def _project_version(path: str) -> str: def test_release_version_is_consistent_across_projects(): - assert release.VERSION == "1.1.2" - assert release.DISPLAY_VERSION == "ver.1.1.2" - assert release.ARTIFACT_VERSION == "_v1.1.2" + assert release.VERSION == "1.2.0" + assert release.DISPLAY_VERSION == "ver.1.2.0" + assert release.ARTIFACT_VERSION == "_v1.2.0" assert { _project_version("pyproject.toml"), _project_version("packages/verification-core/pyproject.toml"),