Correct calendar data for 1950-2100
Browse filesRebuild all eight Parquet tables for blocks 1950-2049 and 2050-2149, refresh the 2026-08 sample and metadata, and publish the full 151-block validation report.
- .gitattributes +1 -0
- README.md +18 -7
- data/v1/astro_events/astro-events-1950-2049.parquet +2 -2
- data/v1/astro_events/astro-events-2050-2149.parquet +2 -2
- data/v1/astro_months/astro-months-1950-2049.parquet +2 -2
- data/v1/astro_months/astro-months-2050-2149.parquet +2 -2
- data/v1/calendar_events/calendar-events-1950-2049.parquet +2 -2
- data/v1/calendar_events/calendar-events-2050-2149.parquet +2 -2
- data/v1/calendar_months/calendar-months-1950-2049.parquet +1 -1
- data/v1/calendar_months/calendar-months-2050-2149.parquet +1 -1
- data/v1/days/days-1950-2049.parquet +2 -2
- data/v1/days/days-2050-2149.parquet +2 -2
- data/v1/eclipse_years/eclipse-years-1950-2049.parquet +2 -2
- data/v1/eclipse_years/eclipse-years-2050-2149.parquet +2 -2
- data/v1/lunar_eclipses/lunar-eclipses-1950-2049.parquet +2 -2
- data/v1/lunar_eclipses/lunar-eclipses-2050-2149.parquet +2 -2
- data/v1/solar_eclipses/solar-eclipses-1950-2049.parquet +2 -2
- data/v1/solar_eclipses/solar-eclipses-2050-2149.parquet +2 -2
- metadata/v1/parquet-sha256.txt +16 -16
- metadata/v1/parquet_manifest.json +0 -0
- metadata/v1/parquet_validation_report.json +1 -1
- metadata/v1/source_web_data/CCC-local-fixes.patch +425 -0
- metadata/v1/source_web_data/DATA_FORMAT.md +7 -0
- metadata/v1/source_web_data/VALIDATION.md +1 -1
- metadata/v1/source_web_data/manifest.json +1 -1
- metadata/v1/source_web_data/source-sha256.txt +3 -0
- metadata/v1/source_web_data/validation_report.json +1 -1
- sample/2026-08/data/v1/astro_events/astro-events-2026-08.parquet +2 -2
- sample/2026-08/data/v1/astro_months/astro-months-2026-08.parquet +1 -1
- sample/2026-08/data/v1/calendar_events/calendar-events-2026-08.parquet +2 -2
- sample/2026-08/data/v1/calendar_months/calendar-months-2026-08.parquet +1 -1
- sample/2026-08/data/v1/days/days-2026-08.parquet +2 -2
- sample/2026-08/data/v1/eclipse_years/eclipse-years-2026-08.parquet +2 -2
- sample/2026-08/data/v1/lunar_eclipses/lunar-eclipses-2026-08.parquet +2 -2
- sample/2026-08/data/v1/solar_eclipses/solar-eclipses-2026-08.parquet +2 -2
- sample/2026-08/metadata/v1/parquet-sha256.txt +8 -8
- sample/2026-08/metadata/v1/parquet_manifest.json +1 -1
- sample/2026-08/metadata/v1/parquet_validation_report.json +1 -1
- sample/2026-08/metadata/v1/source_web_data/CCC-local-fixes.patch +425 -0
- sample/2026-08/metadata/v1/source_web_data/DATA_FORMAT.md +7 -0
- sample/2026-08/metadata/v1/source_web_data/VALIDATION.md +1 -1
- sample/2026-08/metadata/v1/source_web_data/manifest.json +1 -1
- sample/2026-08/metadata/v1/source_web_data/validation_report.json +1 -1
.gitattributes
CHANGED
|
@@ -58,3 +58,4 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
|
| 58 |
# Video files - compressed
|
| 59 |
*.mp4 filter=lfs diff=lfs merge=lfs -text
|
| 60 |
*.webm filter=lfs diff=lfs merge=lfs -text
|
|
|
|
|
|
| 58 |
# Video files - compressed
|
| 59 |
*.mp4 filter=lfs diff=lfs merge=lfs -text
|
| 60 |
*.webm filter=lfs diff=lfs merge=lfs -text
|
| 61 |
+
metadata/v1/source_web_data/source-sha256.txt filter=lfs diff=lfs merge=lfs -text
|
README.md
CHANGED
|
@@ -47,7 +47,8 @@ stored as numeric columns and never require JavaScript `Date`.
|
|
| 47 |
- Ephemeris: JPL DE441, with exact source hashes in `metadata/v1/manifest.json`
|
| 48 |
- Huangli profiles: `folk`, `ziping`, `purple`, `xieji`
|
| 49 |
- Far-future civil dates use CCC's documented delta-T extrapolation
|
| 50 |
-
-
|
|
|
|
| 51 |
- Source web-data validation: 15,051/15,051 years passed, zero failed years
|
| 52 |
|
| 53 |
## Tables
|
|
@@ -75,12 +76,22 @@ round-trip rules.
|
|
| 75 |
## Provenance and validation
|
| 76 |
|
| 77 |
The authoritative source manifest, schema, dictionaries, SHA-256 list, and
|
| 78 |
-
validation report are published under `metadata/v1/`. The 2026-08-
|
| 79 |
-
|
| 80 |
-
|
| 81 |
-
|
| 82 |
-
|
| 83 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 84 |
|
| 85 |
For remote-future events, `jd_utc` is a stable serialization convention that
|
| 86 |
holds the final built-in TAI-UTC offset fixed; it is not a prediction of future
|
|
|
|
| 47 |
- Ephemeris: JPL DE441, with exact source hashes in `metadata/v1/manifest.json`
|
| 48 |
- Huangli profiles: `folk`, `ziping`, `purple`, `xieji`
|
| 49 |
- Far-future civil dates use CCC's documented delta-T extrapolation
|
| 50 |
+
- Generation source base commit: `010b7aa`
|
| 51 |
+
- Local correction patch SHA-256: `D092E58D947452A8A96483C015452565692A2FBE0CDCB420C7982B2BF806395F`
|
| 52 |
- Source web-data validation: 15,051/15,051 years passed, zero failed years
|
| 53 |
|
| 54 |
## Tables
|
|
|
|
| 76 |
## Provenance and validation
|
| 77 |
|
| 78 |
The authoritative source manifest, schema, dictionaries, SHA-256 list, and
|
| 79 |
+
validation report are published under `metadata/v1/`. The 2026-08-24
|
| 80 |
+
correction regenerated and deeply compared every source year from 1950 through
|
| 81 |
+
2100. It applies the current time-scale implementation, anchors exact lunar
|
| 82 |
+
phase roots to sequential new moons, handles the real DE441 part boundary with
|
| 83 |
+
coverage-aware kernel selection, and preserves the complete daily-Moon and
|
| 84 |
+
astronomy-event payloads.
|
| 85 |
+
|
| 86 |
+
Because the Parquet release is partitioned in 100-year blocks, all eight tables
|
| 87 |
+
were rebuilt for blocks `1950-2049` and `2050-2149`; rebuilding the latter as a
|
| 88 |
+
whole prevents mixed-generation rows after 2100. The rebuilt files and the
|
| 89 |
+
2026-08 sample were independently checked for hashes, Arrow schemas, row
|
| 90 |
+
counts, canonical payload parsing, and lossless source-object reconstruction.
|
| 91 |
+
The full source Web release was then validated across 15,051/15,051 years with
|
| 92 |
+
zero failures. The uncommitted source correction is archived as
|
| 93 |
+
`metadata/v1/source_web_data/CCC-local-fixes.patch`; it was not pushed to the
|
| 94 |
+
upstream source repository.
|
| 95 |
|
| 96 |
For remote-future events, `jd_utc` is a stable serialization convention that
|
| 97 |
holds the final built-in TAI-UTC offset fixed; it is not a prediction of future
|
data/v1/astro_events/astro-events-1950-2049.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:16845d5230662c845f29e58a209f908fb8c96d1943bd6e674194539c4528532e
|
| 3 |
+
size 105173294
|
data/v1/astro_events/astro-events-2050-2149.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:b09e266313fa13693456845b9738fc275356375fdcdc8b73c01645099f0e490f
|
| 3 |
+
size 105184761
|
data/v1/astro_months/astro-months-1950-2049.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:1edfb8046b4bed314a39aa7910536240c6900b8ddc49c8cdecc718cbb8b1fee6
|
| 3 |
+
size 4357
|
data/v1/astro_months/astro-months-2050-2149.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:0edea2a3b1edc86568e672b6a0b2e6df5b311fa0ef3f86a99636b77d8eb9299d
|
| 3 |
+
size 4330
|
data/v1/calendar_events/calendar-events-1950-2049.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:8af9eea0898e61cab57dd12ee3f8217e86238924607c4136dffadabbc58c5108
|
| 3 |
+
size 632836
|
data/v1/calendar_events/calendar-events-2050-2149.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:8b4ba90a9f8d3dd3bcf1a839a34f9cbb2ba297159dc584762da1b319b5138944
|
| 3 |
+
size 635702
|
data/v1/calendar_months/calendar-months-1950-2049.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
size 3603
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:07c4c3a6ab8d77d9aace03423ff4ea78f615da3eb024b07c3e819834f8142f7a
|
| 3 |
size 3603
|
data/v1/calendar_months/calendar-months-2050-2149.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
size 3565
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:ad0df8ea7434bb2982110284b7fdf3739f1b5ddd396acf4096d4b576b497ec7f
|
| 3 |
size 3565
|
data/v1/days/days-1950-2049.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:4c8c84d9569b7b601e1686d3161584441bff04658eb271dc9bf5cfc70c43df15
|
| 3 |
+
size 15888079
|
data/v1/days/days-2050-2149.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:2468958fac422a050f1b09cdfd81495357e14b74702611ab5b520f2ced0905c0
|
| 3 |
+
size 15876476
|
data/v1/eclipse_years/eclipse-years-1950-2049.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:89b1bdc0146b6980509396fdf8089099e1d71a8f6966474cd9b46e03ebc8c049
|
| 3 |
+
size 16192
|
data/v1/eclipse_years/eclipse-years-2050-2149.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:a12466f4a403e3f2698373b33563149d9cbb999f734578c338b7010376d8af38
|
| 3 |
+
size 15000
|
data/v1/lunar_eclipses/lunar-eclipses-1950-2049.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:7146aa56636b9948ebdb2ff3a61c496f709af9ff58e2fe34b923f6173d7e72e4
|
| 3 |
+
size 218525
|
data/v1/lunar_eclipses/lunar-eclipses-2050-2149.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:7bc61751f24f849c6a999474a1a1aa90e401b87dee2f017a065b78a57bc4916c
|
| 3 |
+
size 221605
|
data/v1/solar_eclipses/solar-eclipses-1950-2049.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:e51cdda4ddc5b5777e4accf08b6d78780b1c93c5fb1486e5f29dd78f1ca533e0
|
| 3 |
+
size 194783
|
data/v1/solar_eclipses/solar-eclipses-2050-2149.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:e38a3f8bbf866f8c0f7d67449d6d3d9624ecc5de18c110c250e4659ea0ccad19
|
| 3 |
+
size 202733
|
metadata/v1/parquet-sha256.txt
CHANGED
|
@@ -68,8 +68,8 @@ a6ac6d9d1641e4c9fb965989858f75f38f2ba0054b42eb82e6c1c36e88ac7dbb data/v1/astro_
|
|
| 68 |
b74294398036ddb043715162f7fee54c165b0e60f86eb1f01d1cbb19e2241ae2 data/v1/astro_events/astro-events-16750-16849.parquet
|
| 69 |
5e0ae20f7de429365d8d1a31e6e5e192492b863bb490a915fb3f767dc5d01d11 data/v1/astro_events/astro-events-16850-16949.parquet
|
| 70 |
d127265aff4c5b76ce6b29b33adb234b63a2cdb52f57ccf7a8439f665a505d1d data/v1/astro_events/astro-events-16950-17000.parquet
|
| 71 |
-
|
| 72 |
-
|
| 73 |
0231fb65c8abd570f18dd7e912f2e6ac648a414cfb8e9300df6f647c2a5e7a62 data/v1/astro_events/astro-events-2150-2249.parquet
|
| 74 |
8639e39653efcca1435c68fd059f035e4771b252bfe8124a8b40cd2ef1a7612e data/v1/astro_events/astro-events-2250-2349.parquet
|
| 75 |
21d50da85af8a55818e063ce91fe083377f6a13540443e5903413e4d5d2f7cd2 data/v1/astro_events/astro-events-2350-2449.parquet
|
|
@@ -219,8 +219,8 @@ d274b974fa77eb34ad2eebd91857f9c85387ae59c41eb110befed691af61a1a0 data/v1/astro_
|
|
| 219 |
e3a4f173428635751a403a8496e040d9a669b5b04f8aef98d5c5ada7f917bd84 data/v1/astro_months/astro-months-16750-16849.parquet
|
| 220 |
aef4f75739752dcbd6615fdb2d7e5c28a6427addeda1501e4bc52f9155ec31d4 data/v1/astro_months/astro-months-16850-16949.parquet
|
| 221 |
3ffe1a15193868649f95cda6579c572b0c21f295d75a2a6e6d422a0d3c6163c6 data/v1/astro_months/astro-months-16950-17000.parquet
|
| 222 |
-
|
| 223 |
-
|
| 224 |
16975aece2481a84f8e7bfc95dce330164c106a014f6dfb4465759ec907af09d data/v1/astro_months/astro-months-2150-2249.parquet
|
| 225 |
c182474307f297d9a99ee73100ff48822b18ce9a3218272411694d2044715b04 data/v1/astro_months/astro-months-2250-2349.parquet
|
| 226 |
8315e32b27e57d855dbff8c692c4266f9e1add64910199cd43ce37607909cfa8 data/v1/astro_months/astro-months-2350-2449.parquet
|
|
@@ -370,8 +370,8 @@ d045b63858d30876a488eaf5b7b2b00e74d61e1da177b86066beb8cb52bb6080 data/v1/calend
|
|
| 370 |
28fb9ee94cc91be178ea013d28c491e66c715c8e2ca564416f855b4d66c0f652 data/v1/calendar_events/calendar-events-16750-16849.parquet
|
| 371 |
4c49ba0b0db8c27eb32a9467eca946eb0ee61935c87eea2171d2a1d657b95e2e data/v1/calendar_events/calendar-events-16850-16949.parquet
|
| 372 |
fac39bafd1cedf3396617a48777190594b31f0b60b8155a9e75266d9f64480d8 data/v1/calendar_events/calendar-events-16950-17000.parquet
|
| 373 |
-
|
| 374 |
-
|
| 375 |
ff5c0f22290e347344432e44736fb559cd6913dd1f9befde3ffe8469374d691d data/v1/calendar_events/calendar-events-2150-2249.parquet
|
| 376 |
87ba4de8871f1a2e23acbe10b5a61e25726c2e577de1b4a81ed5c3a0a48e3a5a data/v1/calendar_events/calendar-events-2250-2349.parquet
|
| 377 |
539453e89efad1b0f73ceaec079e368a8b037728ecb43d8ce079fc1a77c83949 data/v1/calendar_events/calendar-events-2350-2449.parquet
|
|
@@ -521,8 +521,8 @@ a84be4b07afa7039f7b4d9fa087af012ab711d625a228d5efd752f0fae667b65 data/v1/calend
|
|
| 521 |
47368ba51f7f8eb165a7d6bc90be919616caa158f984440f34b630eb95d18e82 data/v1/calendar_months/calendar-months-16750-16849.parquet
|
| 522 |
a4308379edabfd9241f484baf3c7bacb44392f3e47b99792b7c02fe94c885668 data/v1/calendar_months/calendar-months-16850-16949.parquet
|
| 523 |
cd49df0b83b146843c7db4e89c9d4302cd0d7a9a6eefd001fa59a12ef87928ca data/v1/calendar_months/calendar-months-16950-17000.parquet
|
| 524 |
-
|
| 525 |
-
|
| 526 |
b55641afa8d40b1a2c86bedab047e908b34cb16953711ba1443e091c06c687b1 data/v1/calendar_months/calendar-months-2150-2249.parquet
|
| 527 |
3440d2deb30e45699c990ba944afb353d3d3f530e95d5e6fb616b1ffcedaa6a5 data/v1/calendar_months/calendar-months-2250-2349.parquet
|
| 528 |
a51ecf2a8c4eab80236bc054e6a4d992f3c8c17b0dbf10afad3e857d5762eb9c data/v1/calendar_months/calendar-months-2350-2449.parquet
|
|
@@ -672,8 +672,8 @@ f5e79b8248ddbcf59a8a178e7831465ff086f45950f8b0dbece8cc522458aea5 data/v1/days/d
|
|
| 672 |
08cbc2a6f5cfb8923979bdbb9bb758fa0c1c587ebfa2670648816b1dc2162633 data/v1/days/days-16750-16849.parquet
|
| 673 |
1e5ab7864fcc4f46c15214c62431a672426ba58dc566d4ccb1b0dcba9c81ad51 data/v1/days/days-16850-16949.parquet
|
| 674 |
cc0048e2f651da15ce978f7afadcbbf9d326fc4475f2d740514fcdcc71d50ea9 data/v1/days/days-16950-17000.parquet
|
| 675 |
-
|
| 676 |
-
|
| 677 |
85eaff4307ff7fee567240fdbbbe408440648efe34063b4e34a2dcd49ad9560a data/v1/days/days-2150-2249.parquet
|
| 678 |
41127aad23232cc0cd3a9bc3950dd94bebe84728d451ca2ba300bfd700c321aa data/v1/days/days-2250-2349.parquet
|
| 679 |
ea002cd8f22ef9605f54461870f0e1a739513d235d588364ad652b2cd5ab0035 data/v1/days/days-2350-2449.parquet
|
|
@@ -823,8 +823,8 @@ c5bae578f0285a15daf50379c18e2cbcf66dd8b25eca6b6379cf1a581ee9ece9 data/v1/eclips
|
|
| 823 |
c4c4bf7fecb98ddb1209e539d2b66ed7e62a1646ccec323ff1f2505340d2212e data/v1/eclipse_years/eclipse-years-16750-16849.parquet
|
| 824 |
c6c49df8a819e4d409fb5618d1826ab803f5434722747106ee1913f34c20237d data/v1/eclipse_years/eclipse-years-16850-16949.parquet
|
| 825 |
bdb6c90790e6f6a4d1dce21b1ba1a4f65317ebe41e97191c7591b7615f815985 data/v1/eclipse_years/eclipse-years-16950-17000.parquet
|
| 826 |
-
|
| 827 |
-
|
| 828 |
e867fd3546ad1829f8cad72c904f1f4a36666a64e804220440248245cdcb3ff1 data/v1/eclipse_years/eclipse-years-2150-2249.parquet
|
| 829 |
b4d46669d2ca58d3e8e9c0fa4e672e20baf16dc8ef3bd434f9024ed5ad431412 data/v1/eclipse_years/eclipse-years-2250-2349.parquet
|
| 830 |
866646cf0d6fa4ef67041e3f4deaaa0a0954709a4ff3339d1a8eb1901c8fdeef data/v1/eclipse_years/eclipse-years-2350-2449.parquet
|
|
@@ -974,8 +974,8 @@ bbc8a26c6353349a76b2fb34eaddca1a43e18354793369c406abad0b77150e3b data/v1/lunar_
|
|
| 974 |
437990700c670fd529e38aaadff1f5443d87e2c3ae518a727edb5bf4ac764436 data/v1/lunar_eclipses/lunar-eclipses-16750-16849.parquet
|
| 975 |
7161563694d9a9b48730d08dbee7204196c5ed750da744aa8ce611df0d9f853a data/v1/lunar_eclipses/lunar-eclipses-16850-16949.parquet
|
| 976 |
cea2b4c6c36336f4a7c555288e8b023e5b5a94f17292be9f379262f5dddd203b data/v1/lunar_eclipses/lunar-eclipses-16950-17000.parquet
|
| 977 |
-
|
| 978 |
-
|
| 979 |
049dc16d94604d775fd07d9f861d6b3d4a2c268706f5670ec99710fc634babd0 data/v1/lunar_eclipses/lunar-eclipses-2150-2249.parquet
|
| 980 |
625caaf87ec970fc2191b716a8255010efc00f7279d7a0c2085895dbd1253a26 data/v1/lunar_eclipses/lunar-eclipses-2250-2349.parquet
|
| 981 |
cd1b3862924500d1caa761356bcf9bc0e5b9a62e95bf6aed5f69c76295ed893a data/v1/lunar_eclipses/lunar-eclipses-2350-2449.parquet
|
|
@@ -1125,8 +1125,8 @@ eb1ad6ffe4e5ee96f674e559579f7641dead108a7996facc83bf68631f3ecab1 data/v1/solar_
|
|
| 1125 |
cddbf287a8afb533cccb9d7f2b236fd9e64888d3d85802655763b6dbc100f9d9 data/v1/solar_eclipses/solar-eclipses-16750-16849.parquet
|
| 1126 |
9f40aff93783fb09bc236d574a473720e2548f5054603d67a036bc22a3c66be1 data/v1/solar_eclipses/solar-eclipses-16850-16949.parquet
|
| 1127 |
113a056a1503eae60e59759f74e6d179ca04ca2c8d9f21bedc20d5b4c9588d72 data/v1/solar_eclipses/solar-eclipses-16950-17000.parquet
|
| 1128 |
-
|
| 1129 |
-
|
| 1130 |
fad4df2556333337b697e3bec3e78fe11b625fa81f2be6f14997cdf7f1280248 data/v1/solar_eclipses/solar-eclipses-2150-2249.parquet
|
| 1131 |
1c3e246e02a4e09d0430cfff0ab498a48a56cf525571e98c1ffa97500819898c data/v1/solar_eclipses/solar-eclipses-2250-2349.parquet
|
| 1132 |
79ff5e2f47165d47182f63e368618509e53de214f627a0a4270cdd03fb17b3c8 data/v1/solar_eclipses/solar-eclipses-2350-2449.parquet
|
|
|
|
| 68 |
b74294398036ddb043715162f7fee54c165b0e60f86eb1f01d1cbb19e2241ae2 data/v1/astro_events/astro-events-16750-16849.parquet
|
| 69 |
5e0ae20f7de429365d8d1a31e6e5e192492b863bb490a915fb3f767dc5d01d11 data/v1/astro_events/astro-events-16850-16949.parquet
|
| 70 |
d127265aff4c5b76ce6b29b33adb234b63a2cdb52f57ccf7a8439f665a505d1d data/v1/astro_events/astro-events-16950-17000.parquet
|
| 71 |
+
16845d5230662c845f29e58a209f908fb8c96d1943bd6e674194539c4528532e data/v1/astro_events/astro-events-1950-2049.parquet
|
| 72 |
+
b09e266313fa13693456845b9738fc275356375fdcdc8b73c01645099f0e490f data/v1/astro_events/astro-events-2050-2149.parquet
|
| 73 |
0231fb65c8abd570f18dd7e912f2e6ac648a414cfb8e9300df6f647c2a5e7a62 data/v1/astro_events/astro-events-2150-2249.parquet
|
| 74 |
8639e39653efcca1435c68fd059f035e4771b252bfe8124a8b40cd2ef1a7612e data/v1/astro_events/astro-events-2250-2349.parquet
|
| 75 |
21d50da85af8a55818e063ce91fe083377f6a13540443e5903413e4d5d2f7cd2 data/v1/astro_events/astro-events-2350-2449.parquet
|
|
|
|
| 219 |
e3a4f173428635751a403a8496e040d9a669b5b04f8aef98d5c5ada7f917bd84 data/v1/astro_months/astro-months-16750-16849.parquet
|
| 220 |
aef4f75739752dcbd6615fdb2d7e5c28a6427addeda1501e4bc52f9155ec31d4 data/v1/astro_months/astro-months-16850-16949.parquet
|
| 221 |
3ffe1a15193868649f95cda6579c572b0c21f295d75a2a6e6d422a0d3c6163c6 data/v1/astro_months/astro-months-16950-17000.parquet
|
| 222 |
+
1edfb8046b4bed314a39aa7910536240c6900b8ddc49c8cdecc718cbb8b1fee6 data/v1/astro_months/astro-months-1950-2049.parquet
|
| 223 |
+
0edea2a3b1edc86568e672b6a0b2e6df5b311fa0ef3f86a99636b77d8eb9299d data/v1/astro_months/astro-months-2050-2149.parquet
|
| 224 |
16975aece2481a84f8e7bfc95dce330164c106a014f6dfb4465759ec907af09d data/v1/astro_months/astro-months-2150-2249.parquet
|
| 225 |
c182474307f297d9a99ee73100ff48822b18ce9a3218272411694d2044715b04 data/v1/astro_months/astro-months-2250-2349.parquet
|
| 226 |
8315e32b27e57d855dbff8c692c4266f9e1add64910199cd43ce37607909cfa8 data/v1/astro_months/astro-months-2350-2449.parquet
|
|
|
|
| 370 |
28fb9ee94cc91be178ea013d28c491e66c715c8e2ca564416f855b4d66c0f652 data/v1/calendar_events/calendar-events-16750-16849.parquet
|
| 371 |
4c49ba0b0db8c27eb32a9467eca946eb0ee61935c87eea2171d2a1d657b95e2e data/v1/calendar_events/calendar-events-16850-16949.parquet
|
| 372 |
fac39bafd1cedf3396617a48777190594b31f0b60b8155a9e75266d9f64480d8 data/v1/calendar_events/calendar-events-16950-17000.parquet
|
| 373 |
+
8af9eea0898e61cab57dd12ee3f8217e86238924607c4136dffadabbc58c5108 data/v1/calendar_events/calendar-events-1950-2049.parquet
|
| 374 |
+
8b4ba90a9f8d3dd3bcf1a839a34f9cbb2ba297159dc584762da1b319b5138944 data/v1/calendar_events/calendar-events-2050-2149.parquet
|
| 375 |
ff5c0f22290e347344432e44736fb559cd6913dd1f9befde3ffe8469374d691d data/v1/calendar_events/calendar-events-2150-2249.parquet
|
| 376 |
87ba4de8871f1a2e23acbe10b5a61e25726c2e577de1b4a81ed5c3a0a48e3a5a data/v1/calendar_events/calendar-events-2250-2349.parquet
|
| 377 |
539453e89efad1b0f73ceaec079e368a8b037728ecb43d8ce079fc1a77c83949 data/v1/calendar_events/calendar-events-2350-2449.parquet
|
|
|
|
| 521 |
47368ba51f7f8eb165a7d6bc90be919616caa158f984440f34b630eb95d18e82 data/v1/calendar_months/calendar-months-16750-16849.parquet
|
| 522 |
a4308379edabfd9241f484baf3c7bacb44392f3e47b99792b7c02fe94c885668 data/v1/calendar_months/calendar-months-16850-16949.parquet
|
| 523 |
cd49df0b83b146843c7db4e89c9d4302cd0d7a9a6eefd001fa59a12ef87928ca data/v1/calendar_months/calendar-months-16950-17000.parquet
|
| 524 |
+
07c4c3a6ab8d77d9aace03423ff4ea78f615da3eb024b07c3e819834f8142f7a data/v1/calendar_months/calendar-months-1950-2049.parquet
|
| 525 |
+
ad0df8ea7434bb2982110284b7fdf3739f1b5ddd396acf4096d4b576b497ec7f data/v1/calendar_months/calendar-months-2050-2149.parquet
|
| 526 |
b55641afa8d40b1a2c86bedab047e908b34cb16953711ba1443e091c06c687b1 data/v1/calendar_months/calendar-months-2150-2249.parquet
|
| 527 |
3440d2deb30e45699c990ba944afb353d3d3f530e95d5e6fb616b1ffcedaa6a5 data/v1/calendar_months/calendar-months-2250-2349.parquet
|
| 528 |
a51ecf2a8c4eab80236bc054e6a4d992f3c8c17b0dbf10afad3e857d5762eb9c data/v1/calendar_months/calendar-months-2350-2449.parquet
|
|
|
|
| 672 |
08cbc2a6f5cfb8923979bdbb9bb758fa0c1c587ebfa2670648816b1dc2162633 data/v1/days/days-16750-16849.parquet
|
| 673 |
1e5ab7864fcc4f46c15214c62431a672426ba58dc566d4ccb1b0dcba9c81ad51 data/v1/days/days-16850-16949.parquet
|
| 674 |
cc0048e2f651da15ce978f7afadcbbf9d326fc4475f2d740514fcdcc71d50ea9 data/v1/days/days-16950-17000.parquet
|
| 675 |
+
4c8c84d9569b7b601e1686d3161584441bff04658eb271dc9bf5cfc70c43df15 data/v1/days/days-1950-2049.parquet
|
| 676 |
+
2468958fac422a050f1b09cdfd81495357e14b74702611ab5b520f2ced0905c0 data/v1/days/days-2050-2149.parquet
|
| 677 |
85eaff4307ff7fee567240fdbbbe408440648efe34063b4e34a2dcd49ad9560a data/v1/days/days-2150-2249.parquet
|
| 678 |
41127aad23232cc0cd3a9bc3950dd94bebe84728d451ca2ba300bfd700c321aa data/v1/days/days-2250-2349.parquet
|
| 679 |
ea002cd8f22ef9605f54461870f0e1a739513d235d588364ad652b2cd5ab0035 data/v1/days/days-2350-2449.parquet
|
|
|
|
| 823 |
c4c4bf7fecb98ddb1209e539d2b66ed7e62a1646ccec323ff1f2505340d2212e data/v1/eclipse_years/eclipse-years-16750-16849.parquet
|
| 824 |
c6c49df8a819e4d409fb5618d1826ab803f5434722747106ee1913f34c20237d data/v1/eclipse_years/eclipse-years-16850-16949.parquet
|
| 825 |
bdb6c90790e6f6a4d1dce21b1ba1a4f65317ebe41e97191c7591b7615f815985 data/v1/eclipse_years/eclipse-years-16950-17000.parquet
|
| 826 |
+
89b1bdc0146b6980509396fdf8089099e1d71a8f6966474cd9b46e03ebc8c049 data/v1/eclipse_years/eclipse-years-1950-2049.parquet
|
| 827 |
+
a12466f4a403e3f2698373b33563149d9cbb999f734578c338b7010376d8af38 data/v1/eclipse_years/eclipse-years-2050-2149.parquet
|
| 828 |
e867fd3546ad1829f8cad72c904f1f4a36666a64e804220440248245cdcb3ff1 data/v1/eclipse_years/eclipse-years-2150-2249.parquet
|
| 829 |
b4d46669d2ca58d3e8e9c0fa4e672e20baf16dc8ef3bd434f9024ed5ad431412 data/v1/eclipse_years/eclipse-years-2250-2349.parquet
|
| 830 |
866646cf0d6fa4ef67041e3f4deaaa0a0954709a4ff3339d1a8eb1901c8fdeef data/v1/eclipse_years/eclipse-years-2350-2449.parquet
|
|
|
|
| 974 |
437990700c670fd529e38aaadff1f5443d87e2c3ae518a727edb5bf4ac764436 data/v1/lunar_eclipses/lunar-eclipses-16750-16849.parquet
|
| 975 |
7161563694d9a9b48730d08dbee7204196c5ed750da744aa8ce611df0d9f853a data/v1/lunar_eclipses/lunar-eclipses-16850-16949.parquet
|
| 976 |
cea2b4c6c36336f4a7c555288e8b023e5b5a94f17292be9f379262f5dddd203b data/v1/lunar_eclipses/lunar-eclipses-16950-17000.parquet
|
| 977 |
+
7146aa56636b9948ebdb2ff3a61c496f709af9ff58e2fe34b923f6173d7e72e4 data/v1/lunar_eclipses/lunar-eclipses-1950-2049.parquet
|
| 978 |
+
7bc61751f24f849c6a999474a1a1aa90e401b87dee2f017a065b78a57bc4916c data/v1/lunar_eclipses/lunar-eclipses-2050-2149.parquet
|
| 979 |
049dc16d94604d775fd07d9f861d6b3d4a2c268706f5670ec99710fc634babd0 data/v1/lunar_eclipses/lunar-eclipses-2150-2249.parquet
|
| 980 |
625caaf87ec970fc2191b716a8255010efc00f7279d7a0c2085895dbd1253a26 data/v1/lunar_eclipses/lunar-eclipses-2250-2349.parquet
|
| 981 |
cd1b3862924500d1caa761356bcf9bc0e5b9a62e95bf6aed5f69c76295ed893a data/v1/lunar_eclipses/lunar-eclipses-2350-2449.parquet
|
|
|
|
| 1125 |
cddbf287a8afb533cccb9d7f2b236fd9e64888d3d85802655763b6dbc100f9d9 data/v1/solar_eclipses/solar-eclipses-16750-16849.parquet
|
| 1126 |
9f40aff93783fb09bc236d574a473720e2548f5054603d67a036bc22a3c66be1 data/v1/solar_eclipses/solar-eclipses-16850-16949.parquet
|
| 1127 |
113a056a1503eae60e59759f74e6d179ca04ca2c8d9f21bedc20d5b4c9588d72 data/v1/solar_eclipses/solar-eclipses-16950-17000.parquet
|
| 1128 |
+
e51cdda4ddc5b5777e4accf08b6d78780b1c93c5fb1486e5f29dd78f1ca533e0 data/v1/solar_eclipses/solar-eclipses-1950-2049.parquet
|
| 1129 |
+
e38a3f8bbf866f8c0f7d67449d6d3d9624ecc5de18c110c250e4659ea0ccad19 data/v1/solar_eclipses/solar-eclipses-2050-2149.parquet
|
| 1130 |
fad4df2556333337b697e3bec3e78fe11b625fa81f2be6f14997cdf7f1280248 data/v1/solar_eclipses/solar-eclipses-2150-2249.parquet
|
| 1131 |
1c3e246e02a4e09d0430cfff0ab498a48a56cf525571e98c1ffa97500819898c data/v1/solar_eclipses/solar-eclipses-2250-2349.parquet
|
| 1132 |
79ff5e2f47165d47182f63e368618509e53de214f627a0a4270cdd03fb17b3c8 data/v1/solar_eclipses/solar-eclipses-2350-2449.parquet
|
metadata/v1/parquet_manifest.json
CHANGED
|
The diff for this file is too large to render.
See raw diff
|
|
|
metadata/v1/parquet_validation_report.json
CHANGED
|
@@ -1 +1 @@
|
|
| 1 |
-
{"v":1,"builder_version":"1.2.0","verifier_version":"1.1.0","generated_at":"2026-08-
|
|
|
|
| 1 |
+
{"v":1,"builder_version":"1.2.0","verifier_version":"1.1.0","generated_at":"2026-08-24T07:11:45Z","blocks":151,"passed_blocks":151,"failed_blocks":0,"checked_files":1208,"checked_bytes":18390679036,"verified_tables":["days","calendar_months","calendar_events","astro_months","astro_events","eclipse_years","solar_eclipses","lunar_eclipses"],"preserved_tables":[],"counts":{"days":5497265,"calendar_months":180612,"calendar_events":1105846,"astro_months":180612,"astro_events":218433381,"eclipse_years":15051,"solar_eclipses":35735,"lunar_eclipses":36159},"checks":["committed_state","artifact_size","artifact_sha256","parquet_schema_metadata","row_count","canonical_json_parse","length_delimited_source_digest"],"errors":[]}
|
metadata/v1/source_web_data/CCC-local-fixes.patch
ADDED
|
@@ -0,0 +1,425 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
diff --git a/include/lunar/events.hpp b/include/lunar/events.hpp
|
| 2 |
+
index 12d54fd..eb77998 100644
|
| 3 |
+
--- a/include/lunar/events.hpp
|
| 4 |
+
+++ b/include/lunar/events.hpp
|
| 5 |
+
@@ -12,6 +12,9 @@ struct EventRec{
|
| 6 |
+
double jd_utc=std::numeric_limits<double>::quiet_NaN();
|
| 7 |
+
std::string utc_iso;
|
| 8 |
+
std::string loc_iso;
|
| 9 |
+
+ // Optional source-specific technical payload. Astronomy events use this
|
| 10 |
+
+ // for quantities such as greatest elongation/separation and motion state.
|
| 11 |
+
+ std::string detail;
|
| 12 |
+
};
|
| 13 |
+
|
| 14 |
+
struct MonthRec{
|
| 15 |
+
diff --git a/include/lunar/spc_ephem.hpp b/include/lunar/spc_ephem.hpp
|
| 16 |
+
index e8de452..074d63e 100644
|
| 17 |
+
--- a/include/lunar/spc_ephem.hpp
|
| 18 |
+
+++ b/include/lunar/spc_ephem.hpp
|
| 19 |
+
@@ -37,6 +37,7 @@ struct EphRead{
|
| 20 |
+
int MOON;
|
| 21 |
+
std::map<int,std::string> id_name;
|
| 22 |
+
std::shared_ptr<SpkFile> kern;
|
| 23 |
+
+ std::vector<std::shared_ptr<SpkFile>> kerns;
|
| 24 |
+
bool kern_loaded=false;
|
| 25 |
+
bool use_series=false;
|
| 26 |
+
|
| 27 |
+
diff --git a/src/calendar.cpp b/src/calendar.cpp
|
| 28 |
+
index a849db2..1c13b52 100644
|
| 29 |
+
--- a/src/calendar.cpp
|
| 30 |
+
+++ b/src/calendar.cpp
|
| 31 |
+
@@ -384,17 +384,14 @@ YearResult SolLunCal::compute_year(int year,std::ostream*log){
|
| 32 |
+
|
| 33 |
+
const auto&phase_defs=lp_defs();
|
| 34 |
+
const auto&offsets=lp_offs();
|
| 35 |
+
+ const double first_nm=newton(
|
| 36 |
+
+ "lunar",jd_anch,phase_defs.at("new_moon").angle);
|
| 37 |
+
|
| 38 |
+
for(int idx=0;idx<18;++idx){
|
| 39 |
+
- double base_jd=jd_anch+idx*SYNODDAY;
|
| 40 |
+
- for(const auto&ph : phase_defs){
|
| 41 |
+
- const std::string&key=ph.first;
|
| 42 |
+
- double ang=ph.second.angle;
|
| 43 |
+
- double offset=offsets.at(key);
|
| 44 |
+
- double guess=base_jd+offset;
|
| 45 |
+
- tasks.push_back({"lunar",ang,guess,1e-8,20});
|
| 46 |
+
- metas.push_back({false,"",0,key,idx});
|
| 47 |
+
- }
|
| 48 |
+
+ const double guess=first_nm+idx*SYNODDAY;
|
| 49 |
+
+ tasks.push_back(
|
| 50 |
+
+ {"lunar",phase_defs.at("new_moon").angle,guess,1e-8,20});
|
| 51 |
+
+ metas.push_back({false,"",0,"new_moon",idx});
|
| 52 |
+
}
|
| 53 |
+
|
| 54 |
+
auto task_out=run_roots(tasks);
|
| 55 |
+
@@ -432,6 +429,41 @@ YearResult SolLunCal::compute_year(int year,std::ostream*log){
|
| 56 |
+
}
|
| 57 |
+
}
|
| 58 |
+
|
| 59 |
+
+ // Anchor every quarter/full phase to the actual new moon of its lunation.
|
| 60 |
+
+ // Solving all four phases from independent fixed guesses can converge one
|
| 61 |
+
+ // of them to an adjacent lunation when the varying synodic month length
|
| 62 |
+
+ // accumulates near the branch boundary.
|
| 63 |
+
+ std::vector<RootTask> phase_tasks;
|
| 64 |
+
+ std::vector<TaskMeta> phase_metas;
|
| 65 |
+
+ for(int idx=0;idx<18;++idx){
|
| 66 |
+
+ auto it_nm=lun_res.find({"new_moon",idx});
|
| 67 |
+
+ if(it_nm==lun_res.end()){
|
| 68 |
+
+ continue;
|
| 69 |
+
+ }
|
| 70 |
+
+ for(const auto&ph : phase_defs){
|
| 71 |
+
+ const std::string&key=ph.first;
|
| 72 |
+
+ if(key=="new_moon"){
|
| 73 |
+
+ continue;
|
| 74 |
+
+ }
|
| 75 |
+
+ const double guess=it_nm->second+offsets.at(key);
|
| 76 |
+
+ phase_tasks.push_back(
|
| 77 |
+
+ {"lunar",ph.second.angle,guess,1e-8,20});
|
| 78 |
+
+ phase_metas.push_back({false,"",0,key,idx});
|
| 79 |
+
+ }
|
| 80 |
+
+ }
|
| 81 |
+
+ const auto phase_out=run_roots(phase_tasks);
|
| 82 |
+
+ for(std::size_t i=0;i<phase_tasks.size();++i){
|
| 83 |
+
+ if(!phase_out.second[i].empty()){
|
| 84 |
+
+ if(log){
|
| 85 |
+
+ (*log)<<" Lunar phase task "<<i<<" failed: "
|
| 86 |
+
+ <<phase_out.second[i]<<std::endl;
|
| 87 |
+
+ }
|
| 88 |
+
+ continue;
|
| 89 |
+
+ }
|
| 90 |
+
+ const auto&meta=phase_metas[i];
|
| 91 |
+
+ lun_res[{meta.lp_key,meta.lp_idx}]=phase_out.first[i];
|
| 92 |
+
+ }
|
| 93 |
+
+
|
| 94 |
+
if(std::isnan(ws_prevjd)){
|
| 95 |
+
throw std::runtime_error("未能求解上一年冬至");
|
| 96 |
+
}
|
| 97 |
+
diff --git a/src/query/cmd_export.cpp b/src/query/cmd_export.cpp
|
| 98 |
+
index 8e06b95..dd22d6e 100644
|
| 99 |
+
--- a/src/query/cmd_export.cpp
|
| 100 |
+
+++ b/src/query/cmd_export.cpp
|
| 101 |
+
@@ -645,8 +645,18 @@ void write_export_day_json(JsonWriter&w,const ExportOpt&opt,
|
| 102 |
+
w.obj_end();
|
| 103 |
+
w.key("moon");
|
| 104 |
+
w.obj_begin();
|
| 105 |
+
+ w.key("elongation_rad");
|
| 106 |
+
+ w.value(atd.elong);
|
| 107 |
+
w.key("elongation_deg");
|
| 108 |
+
w.value(atd.elong_deg);
|
| 109 |
+
+ w.key("moon_longitude_rad");
|
| 110 |
+
+ w.value(atd.lam_m);
|
| 111 |
+
+ w.key("moon_longitude_rate_rad_per_day");
|
| 112 |
+
+ w.value(atd.lam_m_dot);
|
| 113 |
+
+ w.key("sun_longitude_rad");
|
| 114 |
+
+ w.value(atd.lam_s);
|
| 115 |
+
+ w.key("sun_longitude_rate_rad_per_day");
|
| 116 |
+
+ w.value(atd.lam_s_dot);
|
| 117 |
+
w.key("ill_frac");
|
| 118 |
+
w.value(atd.ill_frac);
|
| 119 |
+
w.key("ill_pct");
|
| 120 |
+
diff --git a/src/query/cmd_info_cfg_comp.cpp b/src/query/cmd_info_cfg_comp.cpp
|
| 121 |
+
index 0d5dbfb..30109e1 100644
|
| 122 |
+
--- a/src/query/cmd_info_cfg_comp.cpp
|
| 123 |
+
+++ b/src/query/cmd_info_cfg_comp.cpp
|
| 124 |
+
@@ -292,8 +292,9 @@ void write_info(std::ostream&os,const InfoOpt&opt,const InfoRes&res){
|
| 125 |
+
w.key("leap_last");
|
| 126 |
+
w.value("2017-01-01");
|
| 127 |
+
w.key("delt_str");
|
| 128 |
+
- w.value("year<1970 or year>2026: em53; [1972,2026]: leap table; "
|
| 129 |
+
- "[1970,1972): legacy");
|
| 130 |
+
+ w.value("SMH2020 historical splines; USNO atomic/monthly "
|
| 131 |
+
+ "observations and predictions; Stephenson-Morrison "
|
| 132 |
+
+ "long-term extrapolation");
|
| 133 |
+
w.key("spk_cov");
|
| 134 |
+
if(res.has_cov){
|
| 135 |
+
w.obj_begin();
|
| 136 |
+
@@ -323,8 +324,9 @@ void write_info(std::ostream&os,const InfoOpt&opt,const InfoRes&res){
|
| 137 |
+
os<<"ephem.exists="<<(res.exists?"1":"0")<<"\n";
|
| 138 |
+
os<<"ephem.fsize_b="<<res.size<<"\n";
|
| 139 |
+
os<<"timescale.leap_last=2017-01-01\n";
|
| 140 |
+
- os<<"timescale.delt_str=year<1970 or year>2026: em53; "
|
| 141 |
+
- "[1972,2026]: leap table; [1970,1972): legacy\n";
|
| 142 |
+
+ os<<"timescale.delt_str=SMH2020 historical splines; USNO "
|
| 143 |
+
+ "atomic/monthly observations and predictions; "
|
| 144 |
+
+ "Stephenson-Morrison long-term extrapolation\n";
|
| 145 |
+
if(res.has_cov){
|
| 146 |
+
os<<"spk.jd_tstart="<<format_num(res.jd_start)<<"\n";
|
| 147 |
+
os<<"spk.jd_tdb_end="<<format_num(res.jd_end)<<"\n";
|
| 148 |
+
diff --git a/src/query/core/base.cpp b/src/query/core/base.cpp
|
| 149 |
+
index 10334f6..26ec2c9 100644
|
| 150 |
+
--- a/src/query/core/base.cpp
|
| 151 |
+
+++ b/src/query/core/base.cpp
|
| 152 |
+
@@ -386,6 +386,7 @@ EventRec mk_astro_rec(const AstroEvt&src,int tz_off){
|
| 153 |
+
out.jd_tdb=TimeScale::utc_to_tdb(src.jd_utc);
|
| 154 |
+
out.utc_iso=fmt_iso(src.jd_utc,0,true);
|
| 155 |
+
out.loc_iso=fmt_iso(src.jd_utc,tz_off,true);
|
| 156 |
+
+ out.detail=src.detail;
|
| 157 |
+
return out;
|
| 158 |
+
}
|
| 159 |
+
|
| 160 |
+
diff --git a/src/query/core/evt.cpp b/src/query/core/evt.cpp
|
| 161 |
+
index 40950f3..155497f 100644
|
| 162 |
+
--- a/src/query/core/evt.cpp
|
| 163 |
+
+++ b/src/query/core/evt.cpp
|
| 164 |
+
@@ -89,6 +89,10 @@ void wr_ejson(JsonWriter&w,const EventRec&ev,EphRead&eph,bool calc_eclipse=false
|
| 165 |
+
w.value(ev.utc_iso);
|
| 166 |
+
w.key("loc_iso");
|
| 167 |
+
w.value(ev.loc_iso);
|
| 168 |
+
+ if(!ev.detail.empty()){
|
| 169 |
+
+ w.key("detail");
|
| 170 |
+
+ w.value(ev.detail);
|
| 171 |
+
+ }
|
| 172 |
+
if(ev.kind=="lunar_eclipse"){
|
| 173 |
+
w.key("lunar_eclipse");
|
| 174 |
+
LunarEclipse ecl=calc_ecl_for_event(eph,ev);
|
| 175 |
+
diff --git a/src/spc_ephem.cpp b/src/spc_ephem.cpp
|
| 176 |
+
index df60fdf..e2ae0b1 100644
|
| 177 |
+
--- a/src/spc_ephem.cpp
|
| 178 |
+
+++ b/src/spc_ephem.cpp
|
| 179 |
+
@@ -2714,6 +2714,30 @@ struct SpkFile{
|
| 180 |
+
State6 o=to_ssb(observer,et,memo,active);
|
| 181 |
+
return t-o;
|
| 182 |
+
}
|
| 183 |
+
+
|
| 184 |
+
+ bool covers_to_ssb(int target,double et,
|
| 185 |
+
+ std::unordered_set<int>&active) const{
|
| 186 |
+
+ if(target==0){
|
| 187 |
+
+ return true;
|
| 188 |
+
+ }
|
| 189 |
+
+ if(!active.insert(target).second){
|
| 190 |
+
+ return false;
|
| 191 |
+
+ }
|
| 192 |
+
+ const SpkSeg*seg=pick_segment(target,et);
|
| 193 |
+
+ const bool covered=seg!=nullptr&&covers_to_ssb(seg->center,et,active);
|
| 194 |
+
+ active.erase(target);
|
| 195 |
+
+ return covered;
|
| 196 |
+
+ }
|
| 197 |
+
+
|
| 198 |
+
+ bool covers_state(int target,int observer,double et) const{
|
| 199 |
+
+ std::unordered_set<int> active;
|
| 200 |
+
+ active.reserve(16U);
|
| 201 |
+
+ if(!covers_to_ssb(target,et,active)){
|
| 202 |
+
+ return false;
|
| 203 |
+
+ }
|
| 204 |
+
+ active.clear();
|
| 205 |
+
+ return covers_to_ssb(observer,et,active);
|
| 206 |
+
+ }
|
| 207 |
+
};
|
| 208 |
+
|
| 209 |
+
namespace{
|
| 210 |
+
@@ -2887,6 +2911,25 @@ const std::vector<int>&series_object_ids(){
|
| 211 |
+
|
| 212 |
+
#endif
|
| 213 |
+
|
| 214 |
+
+std::vector<std::string>split_ephemeris_paths(const std::string&filepath){
|
| 215 |
+
+ std::vector<std::string> out;
|
| 216 |
+
+ std::size_t begin=0;
|
| 217 |
+
+ while(begin<=filepath.size()){
|
| 218 |
+
+ std::size_t end=filepath.find('|',begin);
|
| 219 |
+
+ std::string item=filepath.substr(
|
| 220 |
+
+ begin,end==std::string::npos?std::string::npos:end-begin);
|
| 221 |
+
+ if(item.empty()){
|
| 222 |
+
+ throw std::runtime_error("empty path in composite ephemeris");
|
| 223 |
+
+ }
|
| 224 |
+
+ out.push_back(std::move(item));
|
| 225 |
+
+ if(end==std::string::npos){
|
| 226 |
+
+ break;
|
| 227 |
+
+ }
|
| 228 |
+
+ begin=end+1;
|
| 229 |
+
+ }
|
| 230 |
+
+ return out;
|
| 231 |
+
+}
|
| 232 |
+
+
|
| 233 |
+
}
|
| 234 |
+
|
| 235 |
+
EphRead::EphRead(const std::string&path){
|
| 236 |
+
@@ -2932,18 +2975,28 @@ void EphRead::load_kern(){
|
| 237 |
+
return;
|
| 238 |
+
}
|
| 239 |
+
#endif
|
| 240 |
+
- if(!fs::exists(filepath)){
|
| 241 |
+
- throw std::runtime_error("ephemeris file not found: "+filepath);
|
| 242 |
+
- }
|
| 243 |
+
+ const std::vector<std::string> paths=split_ephemeris_paths(filepath);
|
| 244 |
+
+ for(const std::string&path : paths){
|
| 245 |
+
+ if(is_series_ephem(path)){
|
| 246 |
+
+ throw std::runtime_error(
|
| 247 |
+
+ "series backend cannot be mixed into a composite ephemeris");
|
| 248 |
+
+ }
|
| 249 |
+
+ if(!fs::exists(path)){
|
| 250 |
+
+ throw std::runtime_error("ephemeris file not found: "+path);
|
| 251 |
+
+ }
|
| 252 |
+
|
| 253 |
+
- std::error_code ec;
|
| 254 |
+
- auto fsize=fs::file_size(filepath,ec);
|
| 255 |
+
- if(ec||fsize==0){
|
| 256 |
+
- throw std::runtime_error("ephemeris file is not readable or empty: "+
|
| 257 |
+
- filepath);
|
| 258 |
+
+ std::error_code ec;
|
| 259 |
+
+ auto fsize=fs::file_size(path,ec);
|
| 260 |
+
+ if(ec||fsize==0){
|
| 261 |
+
+ throw std::runtime_error("ephemeris file is not readable or empty: "+
|
| 262 |
+
+ path);
|
| 263 |
+
+ }
|
| 264 |
+
+ kerns.push_back(acq_kernel(path));
|
| 265 |
+
}
|
| 266 |
+
-
|
| 267 |
+
- kern=acq_kernel(filepath);
|
| 268 |
+
+ if(kerns.empty()){
|
| 269 |
+
+ throw std::runtime_error("no ephemeris kernels were loaded");
|
| 270 |
+
+ }
|
| 271 |
+
+ kern=kerns.front();
|
| 272 |
+
kern_loaded=true;
|
| 273 |
+
|
| 274 |
+
if(use_series){
|
| 275 |
+
@@ -2967,8 +3020,11 @@ void EphRead::val_kern(){
|
| 276 |
+
if(use_series){
|
| 277 |
+
return;
|
| 278 |
+
}
|
| 279 |
+
- if(kern->obj_ids.empty()){
|
| 280 |
+
- throw std::runtime_error("No SPK segments found in ephemeris "+filepath);
|
| 281 |
+
+ for(const auto&item : kerns){
|
| 282 |
+
+ if(item->obj_ids.empty()){
|
| 283 |
+
+ throw std::runtime_error("No SPK segments found in ephemeris "+
|
| 284 |
+
+ item->filepath);
|
| 285 |
+
+ }
|
| 286 |
+
}
|
| 287 |
+
}
|
| 288 |
+
|
| 289 |
+
@@ -2987,7 +3043,19 @@ std::pair<PosKm3,VelKmSec3> EphRead::get_state_et_km(int target,int observer,
|
| 290 |
+
return {pos,vel};
|
| 291 |
+
}
|
| 292 |
+
#endif
|
| 293 |
+
- State6 st=kern->rel_state(target,observer,et_tdb);
|
| 294 |
+
+ State6 st;
|
| 295 |
+
+ bool found=false;
|
| 296 |
+
+ for(const auto&item : kerns){
|
| 297 |
+
+ if(item->covers_state(target,observer,et_tdb)){
|
| 298 |
+
+ st=item->rel_state(target,observer,et_tdb);
|
| 299 |
+
+ found=true;
|
| 300 |
+
+ break;
|
| 301 |
+
+ }
|
| 302 |
+
+ }
|
| 303 |
+
+ if(!found){
|
| 304 |
+
+ throw std::runtime_error(
|
| 305 |
+
+ "no composite SPK kernel covers the requested state");
|
| 306 |
+
+ }
|
| 307 |
+
PosKm3 pos(st.px,st.py,st.pz);
|
| 308 |
+
VelKmSec3 vel(st.vx,st.vy,st.vz);
|
| 309 |
+
return {pos,vel};
|
| 310 |
+
@@ -3034,7 +3102,13 @@ std::vector<int> EphRead::spk_objects(){
|
| 311 |
+
return series_object_ids();
|
| 312 |
+
}
|
| 313 |
+
#endif
|
| 314 |
+
- return kern->obj_ids;
|
| 315 |
+
+ std::vector<int> out;
|
| 316 |
+
+ for(const auto&item : kerns){
|
| 317 |
+
+ out.insert(out.end(),item->obj_ids.begin(),item->obj_ids.end());
|
| 318 |
+
+ }
|
| 319 |
+
+ std::sort(out.begin(),out.end());
|
| 320 |
+
+ out.erase(std::unique(out.begin(),out.end()),out.end());
|
| 321 |
+
+ return out;
|
| 322 |
+
}
|
| 323 |
+
|
| 324 |
+
std::vector<std::pair<double,double>> EphRead::spk_coverage(int obj){
|
| 325 |
+
@@ -3045,9 +3119,21 @@ std::vector<std::pair<double,double>> EphRead::spk_coverage(int obj){
|
| 326 |
+
return {};
|
| 327 |
+
}
|
| 328 |
+
#endif
|
| 329 |
+
- auto it=kern->cover_map.find(obj);
|
| 330 |
+
- if(it==kern->cover_map.end()){
|
| 331 |
+
- return {};
|
| 332 |
+
+ std::vector<std::pair<double,double>> out;
|
| 333 |
+
+ for(const auto&item : kerns){
|
| 334 |
+
+ auto it=item->cover_map.find(obj);
|
| 335 |
+
+ if(it!=item->cover_map.end()){
|
| 336 |
+
+ out.insert(out.end(),it->second.begin(),it->second.end());
|
| 337 |
+
+ }
|
| 338 |
+
}
|
| 339 |
+
- return it->second;
|
| 340 |
+
+ std::sort(out.begin(),out.end());
|
| 341 |
+
+ std::vector<std::pair<double,double>> merged;
|
| 342 |
+
+ for(const auto&span : out){
|
| 343 |
+
+ if(merged.empty()||span.first>merged.back().second){
|
| 344 |
+
+ merged.push_back(span);
|
| 345 |
+
+ }else{
|
| 346 |
+
+ merged.back().second=std::max(merged.back().second,span.second);
|
| 347 |
+
+ }
|
| 348 |
+
+ }
|
| 349 |
+
+ return merged;
|
| 350 |
+
}
|
| 351 |
+
diff --git a/tests/test_core_cli.cpp b/tests/test_core_cli.cpp
|
| 352 |
+
index b773345..cf5b021 100644
|
| 353 |
+
--- a/tests/test_core_cli.cpp
|
| 354 |
+
+++ b/tests/test_core_cli.cpp
|
| 355 |
+
@@ -116,6 +116,57 @@ TEST(CalendarSeries, YearHasTermsAndPhases){
|
| 356 |
+
EXPECT_GE(year.lun_phase.size()*4u,48u);
|
| 357 |
+
}
|
| 358 |
+
|
| 359 |
+
+TEST(CalendarSeries, LunarPhasesStayInTheirAnchoredLunation){
|
| 360 |
+
+#if LUNAR_ENABLE_SERIES_FALLBACK
|
| 361 |
+
+ EphRead eph("@series");
|
| 362 |
+
+ SolLunCal solver(eph);
|
| 363 |
+
+ for(int year : {1958,1977,1987}){
|
| 364 |
+
+ const YearResult result=solver.compute_year(year,nullptr);
|
| 365 |
+
+ ASSERT_GE(result.lun_phase.size(),12u)<<year;
|
| 366 |
+
+ for(std::size_t i=0;i<result.lun_phase.size();++i){
|
| 367 |
+
+ const MoonPhMon&phase=result.lun_phase[i];
|
| 368 |
+
+ const double nm=phase.new_moon.toUtcJD();
|
| 369 |
+
+ const double fq=phase.fst_qtr.toUtcJD();
|
| 370 |
+
+ const double fm=phase.full_moon.toUtcJD();
|
| 371 |
+
+ const double lq=phase.lst_qtr.toUtcJD();
|
| 372 |
+
+ EXPECT_LT(nm,fq)<<year<<" lunation "<<i;
|
| 373 |
+
+ EXPECT_LT(fq,fm)<<year<<" lunation "<<i;
|
| 374 |
+
+ EXPECT_LT(fm,lq)<<year<<" lunation "<<i;
|
| 375 |
+
+ if(i+1<result.lun_phase.size()){
|
| 376 |
+
+ EXPECT_LT(lq,result.lun_phase[i+1].new_moon.toUtcJD())
|
| 377 |
+
+ <<year<<" lunation "<<i;
|
| 378 |
+
+ }
|
| 379 |
+
+ }
|
| 380 |
+
+ }
|
| 381 |
+
+#else
|
| 382 |
+
+ GTEST_SKIP()<<"requires series fallback";
|
| 383 |
+
+#endif
|
| 384 |
+
+}
|
| 385 |
+
+
|
| 386 |
+
+TEST(Ephemeris, CompositePathsMatchSingleKernel){
|
| 387 |
+
+ if(!has_reference_bsp()){
|
| 388 |
+
+ GTEST_SKIP()<<"requires LUNAR_TEST_BSP or a repository BSP";
|
| 389 |
+
+ }
|
| 390 |
+
+ const std::string path=reference_bsp();
|
| 391 |
+
+ EphRead single(path);
|
| 392 |
+
+ EphRead composite(path+"|"+path);
|
| 393 |
+
+ const auto coverage=single.spk_coverage(single.EARTH);
|
| 394 |
+
+ ASSERT_FALSE(coverage.empty());
|
| 395 |
+
+ const double et=(coverage.front().first+coverage.front().second)*0.5;
|
| 396 |
+
+ const auto expected=single.get_state_et_km(single.SUN,single.EARTH,et);
|
| 397 |
+
+ const auto actual=composite.get_state_et_km(
|
| 398 |
+
+ composite.SUN,composite.EARTH,et);
|
| 399 |
+
+ EXPECT_DOUBLE_EQ(expected.first.x,actual.first.x);
|
| 400 |
+
+ EXPECT_DOUBLE_EQ(expected.first.y,actual.first.y);
|
| 401 |
+
+ EXPECT_DOUBLE_EQ(expected.first.z,actual.first.z);
|
| 402 |
+
+ EXPECT_DOUBLE_EQ(expected.second.x,actual.second.x);
|
| 403 |
+
+ EXPECT_DOUBLE_EQ(expected.second.y,actual.second.y);
|
| 404 |
+
+ EXPECT_DOUBLE_EQ(expected.second.z,actual.second.z);
|
| 405 |
+
+ EXPECT_EQ(single.spk_objects(),composite.spk_objects());
|
| 406 |
+
+ EXPECT_EQ(single.spk_coverage(single.EARTH),
|
| 407 |
+
+ composite.spk_coverage(composite.EARTH));
|
| 408 |
+
+}
|
| 409 |
+
+
|
| 410 |
+
TEST(CoreGanzhi, ThinApisMatchDayAndCApi){
|
| 411 |
+
if(!has_test_ephem()){
|
| 412 |
+
GTEST_SKIP()<<"requires series fallback or LUNAR_TEST_BSP";
|
| 413 |
+
@@ -1006,6 +1057,12 @@ TEST(CliExport, FullJsonIncludesEventsEclipsesAstroAndAllHuangli){
|
| 414 |
+
EXPECT_NE(txt.find("\"greg_date\":\"2025-09-01\""),std::string::npos);
|
| 415 |
+
EXPECT_NE(txt.find("\"lunar_date\""),std::string::npos);
|
| 416 |
+
EXPECT_NE(txt.find("\"ganzhi\""),std::string::npos);
|
| 417 |
+
+ EXPECT_NE(txt.find("\"elongation_rad\""),std::string::npos);
|
| 418 |
+
+ EXPECT_NE(txt.find("\"moon_longitude_rad\""),std::string::npos);
|
| 419 |
+
+ EXPECT_NE(txt.find("\"moon_longitude_rate_rad_per_day\""),std::string::npos);
|
| 420 |
+
+ EXPECT_NE(txt.find("\"sun_longitude_rad\""),std::string::npos);
|
| 421 |
+
+ EXPECT_NE(txt.find("\"sun_longitude_rate_rad_per_day\""),std::string::npos);
|
| 422 |
+
+ EXPECT_NE(txt.find("\"detail\":\"state=retrograde\""),std::string::npos);
|
| 423 |
+
EXPECT_NE(txt.find("\"events\""),std::string::npos);
|
| 424 |
+
EXPECT_NE(txt.find("\"eclipses\""),std::string::npos);
|
| 425 |
+
EXPECT_NE(txt.find("\"lunar_eclipse\""),std::string::npos);
|
metadata/v1/source_web_data/DATA_FORMAT.md
CHANGED
|
@@ -117,6 +117,13 @@ boundary, ganzhi nodes, 建除, duty god/tag, clashes, harmonies, Pengzu, nayin,
|
|
| 117 |
five elements, fetal god, meridian, direction fields, lunar mansions, gods,
|
| 118 |
activities, Yi/Ji level/rule, equation/true-solar time, and all 13 hour slots.
|
| 119 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 120 |
Profile defaults come from `make_hli_rule_set`; the generator does not collapse
|
| 121 |
their distinct boundaries. UTC+08 civil midnight is not substituted for a
|
| 122 |
profile's Hour-23/Hour-0 Huangli boundary.
|
|
|
|
| 117 |
five elements, fetal god, meridian, direction fields, lunar mansions, gods,
|
| 118 |
activities, Yi/Ji level/rule, equation/true-solar time, and all 13 hour slots.
|
| 119 |
|
| 120 |
+
Current CCC exports distinguish `bazi_month` (the month pillar used by the
|
| 121 |
+
four-pillars calculation) from `god_month` (the month used by the profile's
|
| 122 |
+
god/sha rules), and include `god_month_basis`. Early v1 shards used the
|
| 123 |
+
ambiguous key `month` for what is now `bazi_month`; readers of a mixed v1 tree
|
| 124 |
+
should resolve the month pillar as `bazi_month ?? month`. The legacy value is
|
| 125 |
+
not a third month concept and is exactly equal to the current `bazi_month`.
|
| 126 |
+
|
| 127 |
Profile defaults come from `make_hli_rule_set`; the generator does not collapse
|
| 128 |
their distinct boundaries. UTC+08 civil midnight is not substituted for a
|
| 129 |
profile's Hour-23/Hour-0 Huangli boundary.
|
metadata/v1/source_web_data/VALIDATION.md
CHANGED
|
@@ -3,7 +3,7 @@
|
|
| 3 |
- Requested range: 1950..17000
|
| 4 |
- Verified years: 15051
|
| 5 |
- Failed years: 0
|
| 6 |
-
- Resumed from validated markers:
|
| 7 |
- Checks: 14
|
| 8 |
|
| 9 |
The final pass verifies every stored Brotli and gzip artifact, SHA-256, calendar day, four Huangli profiles, eclipse/astro reference, and eclipse contact ordering.
|
|
|
|
| 3 |
- Requested range: 1950..17000
|
| 4 |
- Verified years: 15051
|
| 5 |
- Failed years: 0
|
| 6 |
+
- Resumed from validated markers: 14900
|
| 7 |
- Checks: 14
|
| 8 |
|
| 9 |
The final pass verifies every stored Brotli and gzip artifact, SHA-256, calendar day, four Huangli profiles, eclipse/astro reference, and eclipse contact ordering.
|
metadata/v1/source_web_data/manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
| 1 |
-
{"schema_version":1,"generator":"CalcChineseCalendar web_data streaming finalizer","generator_version":"1.0.3","validator_version":"web-finalize-1","generator_git_commit":"
|
|
|
|
| 1 |
+
{"schema_version":1,"generator":"CalcChineseCalendar web_data streaming finalizer","generator_version":"1.0.3","validator_version":"web-finalize-1","generator_git_commit":"010b7aa+patch-d092e58d9474","source_provenance":{"git_commit":"010b7aaf8d9d824144c389f7d487cd88e62f0c8e"},"source_version":"test","state_provenance":{"base_generator_versions":{"1.0.2":13841,"1.0.3":1210},"distinct_base_config_fingerprints":6,"eclipse_repair_versions":{"solar-eclipse-full-v2":14900,"timescale-phase-export-regeneration-v1":151},"note":"Base year provenance is retained; complete solar-eclipse refresh provenance is recorded per state."},"generated_at":"2026-08-24T06:47:06Z","range":{"from":1950,"to":17000},"timezone":"+08:00","lunar_day_timezone":"+08:00","huangli_longitude_deg":120,"ephemeris":[{"id":"de441_part_1","path":"D:\\cdg\\de441_part-1.bsp","bytes":1651119104,"sha256":"13757827f5db41b835a24bbd637488636ce79a8ca754062fed17844f7d5b618e","jd_tdb_start":-3100015.5,"jd_tdb_end":2440432.5},{"id":"de441_part_2","path":"D:\\cdg\\de441_part-2.bsp","bytes":1656830976,"sha256":"3abb17dae2d78dd34880377544aacb54892104a0d4462b322cb9f4454d4887f6","jd_tdb_start":2440400.5,"jd_tdb_end":8000016.5}],"delta_t_model":"SMH2020 historical splines; USNO atomic/monthly observations and predictions; Stephenson-Morrison quadratic-periodic long-term extrapolation","time_scale_policy":{"tdb_tt":"treated as equal at current library precision","delta_t":"TT-UT1","pre_1972_civil_utc":"UT1 approximation","from_1972_utc":"TAI plus built-in leap-second table","future_utc":"last known TAI-UTC offset held fixed; not a leap-second prediction"},"huangli_profiles":["folk","ziping","purple","xieji"],"compression":["brotli","gzip"],"dictionary_version":1,"counts":{"years":15051,"days":5497265,"solar_terms":361225,"lunar_phases":744621,"festivals":195664,"solar_eclipses":35735,"lunar_eclipses":36159,"astro_events":218433381},"sizes":{"raw_json_bytes":82325362558,"encoded_bytes":{"json":0,"brotli":11020066749,"gzip":12800979074},"by_category_encoded_bytes":{"calendar":{"json":0,"brotli":2807015410,"gzip":4054709530},"eclipse":{"json":0,"brotli":77046465,"gzip":82935527},"astro":{"json":0,"brotli":8136004874,"gzip":8663334017}},"average_raw_bytes_per_year":5469760.318782805,"average_raw_calendar_month_bytes":145504.22057781322,"maximum_raw_calendar_month_bytes":163948,"brotli_ratio":0.133859923680702,"gzip_ratio":0.15549253202476251},"cdn":{"cache_control":"public, max-age=31536000, immutable"}}
|
metadata/v1/source_web_data/source-sha256.txt
ADDED
|
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:6b98df68efdd6fb574302e24dc3a9f7d58729d7b3b819c3e8400be1e87163f7e
|
| 3 |
+
size 67628751
|
metadata/v1/source_web_data/validation_report.json
CHANGED
|
@@ -1 +1 @@
|
|
| 1 |
-
{"v":1,"validator_version":"web-finalize-1","range":{"from":1950,"to":17000},"checks":["generation_state_verified","artifact_size_and_sha256","brotli_and_gzip_json_parse","compressed_representation_identity","schema_version","twelve_month_inventory","civil_day_continuity_and_count","event_local_date_and_second","huangli_four_profiles","unique_eclipse_and_astro_ids","eclipse_contact_order","no_orphan_event_references","finite_json_numbers","safe_relative_artifact_paths"],"passed_years":15051,"cached_verified_years":
|
|
|
|
| 1 |
+
{"v":1,"validator_version":"web-finalize-1","range":{"from":1950,"to":17000},"checks":["generation_state_verified","artifact_size_and_sha256","brotli_and_gzip_json_parse","compressed_representation_identity","schema_version","twelve_month_inventory","civil_day_continuity_and_count","event_local_date_and_second","huangli_four_profiles","unique_eclipse_and_astro_ids","eclipse_contact_order","no_orphan_event_references","finite_json_numbers","safe_relative_artifact_paths"],"passed_years":15051,"cached_verified_years":14900,"failed_years":0,"source_comparison_days":5497265,"errors":[],"warnings":["Far-future UT1 uses the repository delta-T extrapolation; projected UTC holds the last known leap-second offset fixed.","Far-future UTC+08 civil dates are a stable serialization convention, not observed or legislated future civil time.","Transit and occultation events require an explicitly configured observer.","Generation-time lossless reconstruction is attested by each verified state; finalization rechecks serialized artifacts and references."]}
|
sample/2026-08/data/v1/astro_events/astro-events-2026-08.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:b942cc926388b3f28f024b66f46265ca84759eba116d5de4737234c1611ce627
|
| 3 |
+
size 103790
|
sample/2026-08/data/v1/astro_months/astro-months-2026-08.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
size 1804
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:0d10c3f1afd4acf00c8cd3e6a407e802544f472962bb0df55b708516adf3daa6
|
| 3 |
size 1804
|
sample/2026-08/data/v1/calendar_events/calendar-events-2026-08.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:018f0a08049f73e6220e6624af8e6075291a9590ef9b0d9c20307db51f6137c4
|
| 3 |
+
size 6677
|
sample/2026-08/data/v1/calendar_months/calendar-months-2026-08.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
size 2916
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:540c0e744430e56793834003b7167c6236640cddebfe4929ef1f7ffb1c8c0f19
|
| 3 |
size 2916
|
sample/2026-08/data/v1/days/days-2026-08.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:49091bf9a227020e99ed873a64cf82809284629c788a08edea7465ffe8563692
|
| 3 |
+
size 27955
|
sample/2026-08/data/v1/eclipse_years/eclipse-years-2026-08.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:b2c8fe5d1bad789a9acf04a3839bc0c50e70a8874382925201fe08f534d5777d
|
| 3 |
+
size 11404
|
sample/2026-08/data/v1/lunar_eclipses/lunar-eclipses-2026-08.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:3b783344c817f0cb9a3734407a5e9feaab270cc297af93620bc28c105aa4e7ec
|
| 3 |
+
size 19092
|
sample/2026-08/data/v1/solar_eclipses/solar-eclipses-2026-08.parquet
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:3a649f175118f3730ffd4a5308611fa49ac044fe2cbf2d628bfb49fd4d8061df
|
| 3 |
+
size 19833
|
sample/2026-08/metadata/v1/parquet-sha256.txt
CHANGED
|
@@ -1,8 +1,8 @@
|
|
| 1 |
-
|
| 2 |
-
|
| 3 |
-
|
| 4 |
-
|
| 5 |
-
|
| 6 |
-
|
| 7 |
-
|
| 8 |
-
|
|
|
|
| 1 |
+
b942cc926388b3f28f024b66f46265ca84759eba116d5de4737234c1611ce627 data/v1/astro_events/astro-events-2026-08.parquet
|
| 2 |
+
0d10c3f1afd4acf00c8cd3e6a407e802544f472962bb0df55b708516adf3daa6 data/v1/astro_months/astro-months-2026-08.parquet
|
| 3 |
+
018f0a08049f73e6220e6624af8e6075291a9590ef9b0d9c20307db51f6137c4 data/v1/calendar_events/calendar-events-2026-08.parquet
|
| 4 |
+
540c0e744430e56793834003b7167c6236640cddebfe4929ef1f7ffb1c8c0f19 data/v1/calendar_months/calendar-months-2026-08.parquet
|
| 5 |
+
49091bf9a227020e99ed873a64cf82809284629c788a08edea7465ffe8563692 data/v1/days/days-2026-08.parquet
|
| 6 |
+
b2c8fe5d1bad789a9acf04a3839bc0c50e70a8874382925201fe08f534d5777d data/v1/eclipse_years/eclipse-years-2026-08.parquet
|
| 7 |
+
3b783344c817f0cb9a3734407a5e9feaab270cc297af93620bc28c105aa4e7ec data/v1/lunar_eclipses/lunar-eclipses-2026-08.parquet
|
| 8 |
+
3a649f175118f3730ffd4a5308611fa49ac044fe2cbf2d628bfb49fd4d8061df data/v1/solar_eclipses/solar-eclipses-2026-08.parquet
|
sample/2026-08/metadata/v1/parquet_manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
| 1 |
-
{"v":1,"builder_version":"1.2.0","generated_at":"2026-08-
|
|
|
|
| 1 |
+
{"v":1,"builder_version":"1.2.0","generated_at":"2026-08-24T06:52:30Z","blocks":["2026-08"],"counts":{"days":31,"calendar_months":1,"calendar_events":6,"astro_months":1,"astro_events":1288,"eclipse_years":1,"solar_eclipses":1,"lunar_eclipses":1},"files":[{"table":"days","path":"data/v1/days/days-2026-08.parquet","rows":31,"bytes":27955,"sha256":"49091bf9a227020e99ed873a64cf82809284629c788a08edea7465ffe8563692","source_digest":"6fb40bfdc715c4d82854744f5847f3eda07c4771625b2598406eef1b136a4650"},{"table":"calendar_months","path":"data/v1/calendar_months/calendar-months-2026-08.parquet","rows":1,"bytes":2916,"sha256":"540c0e744430e56793834003b7167c6236640cddebfe4929ef1f7ffb1c8c0f19","source_digest":"ba3f1c018a32ac1fbb39f9f7951714b437d757dc6df5d0689430a668eac3c80b"},{"table":"calendar_events","path":"data/v1/calendar_events/calendar-events-2026-08.parquet","rows":6,"bytes":6677,"sha256":"018f0a08049f73e6220e6624af8e6075291a9590ef9b0d9c20307db51f6137c4","source_digest":"27705c0d3b5299c0ac015955fb3fa35cfd6228d1291d6b4ddc6026cf1c79620c"},{"table":"astro_months","path":"data/v1/astro_months/astro-months-2026-08.parquet","rows":1,"bytes":1804,"sha256":"0d10c3f1afd4acf00c8cd3e6a407e802544f472962bb0df55b708516adf3daa6","source_digest":"8e53a1afaf1a7a48d29c1aaf819a64b5c2bea75ba0609d81900a0a61ad8a59ed"},{"table":"astro_events","path":"data/v1/astro_events/astro-events-2026-08.parquet","rows":1288,"bytes":103790,"sha256":"b942cc926388b3f28f024b66f46265ca84759eba116d5de4737234c1611ce627","source_digest":"95c8f4ccb2bcc047b6cde174e2b1741f8a4b4975a92f646e64dbf84ac1ba27d6"},{"table":"eclipse_years","path":"data/v1/eclipse_years/eclipse-years-2026-08.parquet","rows":1,"bytes":11404,"sha256":"b2c8fe5d1bad789a9acf04a3839bc0c50e70a8874382925201fe08f534d5777d","source_digest":"cb4a6e7f789116b11af303aa2385af378615043501e80140c287a627b5b2f373"},{"table":"solar_eclipses","path":"data/v1/solar_eclipses/solar-eclipses-2026-08.parquet","rows":1,"bytes":19833,"sha256":"3a649f175118f3730ffd4a5308611fa49ac044fe2cbf2d628bfb49fd4d8061df","source_digest":"c80bbc849ff51147424d6e29a010bf22e9c87e5c2cbe07992d2024b5030c91ec"},{"table":"lunar_eclipses","path":"data/v1/lunar_eclipses/lunar-eclipses-2026-08.parquet","rows":1,"bytes":19092,"sha256":"3b783344c817f0cb9a3734407a5e9feaab270cc297af93620bc28c105aa4e7ec","source_digest":"5802887d08129ab2c1e5cec36594473a495a28036c825ee4cd4b27a01da80792"}]}
|
sample/2026-08/metadata/v1/parquet_validation_report.json
CHANGED
|
@@ -1 +1 @@
|
|
| 1 |
-
{"v":1,"builder_version":"1.2.0","verifier_version":"1.1.0","generated_at":"2026-08-
|
|
|
|
| 1 |
+
{"v":1,"builder_version":"1.2.0","verifier_version":"1.1.0","generated_at":"2026-08-24T06:55:27Z","blocks":1,"passed_blocks":1,"failed_blocks":0,"checked_files":8,"checked_bytes":193471,"verified_tables":["days","calendar_months","calendar_events","astro_months","astro_events","eclipse_years","solar_eclipses","lunar_eclipses"],"preserved_tables":[],"counts":{"days":31,"calendar_months":1,"calendar_events":6,"astro_months":1,"astro_events":1288,"eclipse_years":1,"solar_eclipses":1,"lunar_eclipses":1},"checks":["committed_state","artifact_size","artifact_sha256","parquet_schema_metadata","row_count","canonical_json_parse","length_delimited_source_digest"],"errors":[]}
|
sample/2026-08/metadata/v1/source_web_data/CCC-local-fixes.patch
ADDED
|
@@ -0,0 +1,425 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
diff --git a/include/lunar/events.hpp b/include/lunar/events.hpp
|
| 2 |
+
index 12d54fd..eb77998 100644
|
| 3 |
+
--- a/include/lunar/events.hpp
|
| 4 |
+
+++ b/include/lunar/events.hpp
|
| 5 |
+
@@ -12,6 +12,9 @@ struct EventRec{
|
| 6 |
+
double jd_utc=std::numeric_limits<double>::quiet_NaN();
|
| 7 |
+
std::string utc_iso;
|
| 8 |
+
std::string loc_iso;
|
| 9 |
+
+ // Optional source-specific technical payload. Astronomy events use this
|
| 10 |
+
+ // for quantities such as greatest elongation/separation and motion state.
|
| 11 |
+
+ std::string detail;
|
| 12 |
+
};
|
| 13 |
+
|
| 14 |
+
struct MonthRec{
|
| 15 |
+
diff --git a/include/lunar/spc_ephem.hpp b/include/lunar/spc_ephem.hpp
|
| 16 |
+
index e8de452..074d63e 100644
|
| 17 |
+
--- a/include/lunar/spc_ephem.hpp
|
| 18 |
+
+++ b/include/lunar/spc_ephem.hpp
|
| 19 |
+
@@ -37,6 +37,7 @@ struct EphRead{
|
| 20 |
+
int MOON;
|
| 21 |
+
std::map<int,std::string> id_name;
|
| 22 |
+
std::shared_ptr<SpkFile> kern;
|
| 23 |
+
+ std::vector<std::shared_ptr<SpkFile>> kerns;
|
| 24 |
+
bool kern_loaded=false;
|
| 25 |
+
bool use_series=false;
|
| 26 |
+
|
| 27 |
+
diff --git a/src/calendar.cpp b/src/calendar.cpp
|
| 28 |
+
index a849db2..1c13b52 100644
|
| 29 |
+
--- a/src/calendar.cpp
|
| 30 |
+
+++ b/src/calendar.cpp
|
| 31 |
+
@@ -384,17 +384,14 @@ YearResult SolLunCal::compute_year(int year,std::ostream*log){
|
| 32 |
+
|
| 33 |
+
const auto&phase_defs=lp_defs();
|
| 34 |
+
const auto&offsets=lp_offs();
|
| 35 |
+
+ const double first_nm=newton(
|
| 36 |
+
+ "lunar",jd_anch,phase_defs.at("new_moon").angle);
|
| 37 |
+
|
| 38 |
+
for(int idx=0;idx<18;++idx){
|
| 39 |
+
- double base_jd=jd_anch+idx*SYNODDAY;
|
| 40 |
+
- for(const auto&ph : phase_defs){
|
| 41 |
+
- const std::string&key=ph.first;
|
| 42 |
+
- double ang=ph.second.angle;
|
| 43 |
+
- double offset=offsets.at(key);
|
| 44 |
+
- double guess=base_jd+offset;
|
| 45 |
+
- tasks.push_back({"lunar",ang,guess,1e-8,20});
|
| 46 |
+
- metas.push_back({false,"",0,key,idx});
|
| 47 |
+
- }
|
| 48 |
+
+ const double guess=first_nm+idx*SYNODDAY;
|
| 49 |
+
+ tasks.push_back(
|
| 50 |
+
+ {"lunar",phase_defs.at("new_moon").angle,guess,1e-8,20});
|
| 51 |
+
+ metas.push_back({false,"",0,"new_moon",idx});
|
| 52 |
+
}
|
| 53 |
+
|
| 54 |
+
auto task_out=run_roots(tasks);
|
| 55 |
+
@@ -432,6 +429,41 @@ YearResult SolLunCal::compute_year(int year,std::ostream*log){
|
| 56 |
+
}
|
| 57 |
+
}
|
| 58 |
+
|
| 59 |
+
+ // Anchor every quarter/full phase to the actual new moon of its lunation.
|
| 60 |
+
+ // Solving all four phases from independent fixed guesses can converge one
|
| 61 |
+
+ // of them to an adjacent lunation when the varying synodic month length
|
| 62 |
+
+ // accumulates near the branch boundary.
|
| 63 |
+
+ std::vector<RootTask> phase_tasks;
|
| 64 |
+
+ std::vector<TaskMeta> phase_metas;
|
| 65 |
+
+ for(int idx=0;idx<18;++idx){
|
| 66 |
+
+ auto it_nm=lun_res.find({"new_moon",idx});
|
| 67 |
+
+ if(it_nm==lun_res.end()){
|
| 68 |
+
+ continue;
|
| 69 |
+
+ }
|
| 70 |
+
+ for(const auto&ph : phase_defs){
|
| 71 |
+
+ const std::string&key=ph.first;
|
| 72 |
+
+ if(key=="new_moon"){
|
| 73 |
+
+ continue;
|
| 74 |
+
+ }
|
| 75 |
+
+ const double guess=it_nm->second+offsets.at(key);
|
| 76 |
+
+ phase_tasks.push_back(
|
| 77 |
+
+ {"lunar",ph.second.angle,guess,1e-8,20});
|
| 78 |
+
+ phase_metas.push_back({false,"",0,key,idx});
|
| 79 |
+
+ }
|
| 80 |
+
+ }
|
| 81 |
+
+ const auto phase_out=run_roots(phase_tasks);
|
| 82 |
+
+ for(std::size_t i=0;i<phase_tasks.size();++i){
|
| 83 |
+
+ if(!phase_out.second[i].empty()){
|
| 84 |
+
+ if(log){
|
| 85 |
+
+ (*log)<<" Lunar phase task "<<i<<" failed: "
|
| 86 |
+
+ <<phase_out.second[i]<<std::endl;
|
| 87 |
+
+ }
|
| 88 |
+
+ continue;
|
| 89 |
+
+ }
|
| 90 |
+
+ const auto&meta=phase_metas[i];
|
| 91 |
+
+ lun_res[{meta.lp_key,meta.lp_idx}]=phase_out.first[i];
|
| 92 |
+
+ }
|
| 93 |
+
+
|
| 94 |
+
if(std::isnan(ws_prevjd)){
|
| 95 |
+
throw std::runtime_error("未能求解上一年冬至");
|
| 96 |
+
}
|
| 97 |
+
diff --git a/src/query/cmd_export.cpp b/src/query/cmd_export.cpp
|
| 98 |
+
index 8e06b95..dd22d6e 100644
|
| 99 |
+
--- a/src/query/cmd_export.cpp
|
| 100 |
+
+++ b/src/query/cmd_export.cpp
|
| 101 |
+
@@ -645,8 +645,18 @@ void write_export_day_json(JsonWriter&w,const ExportOpt&opt,
|
| 102 |
+
w.obj_end();
|
| 103 |
+
w.key("moon");
|
| 104 |
+
w.obj_begin();
|
| 105 |
+
+ w.key("elongation_rad");
|
| 106 |
+
+ w.value(atd.elong);
|
| 107 |
+
w.key("elongation_deg");
|
| 108 |
+
w.value(atd.elong_deg);
|
| 109 |
+
+ w.key("moon_longitude_rad");
|
| 110 |
+
+ w.value(atd.lam_m);
|
| 111 |
+
+ w.key("moon_longitude_rate_rad_per_day");
|
| 112 |
+
+ w.value(atd.lam_m_dot);
|
| 113 |
+
+ w.key("sun_longitude_rad");
|
| 114 |
+
+ w.value(atd.lam_s);
|
| 115 |
+
+ w.key("sun_longitude_rate_rad_per_day");
|
| 116 |
+
+ w.value(atd.lam_s_dot);
|
| 117 |
+
w.key("ill_frac");
|
| 118 |
+
w.value(atd.ill_frac);
|
| 119 |
+
w.key("ill_pct");
|
| 120 |
+
diff --git a/src/query/cmd_info_cfg_comp.cpp b/src/query/cmd_info_cfg_comp.cpp
|
| 121 |
+
index 0d5dbfb..30109e1 100644
|
| 122 |
+
--- a/src/query/cmd_info_cfg_comp.cpp
|
| 123 |
+
+++ b/src/query/cmd_info_cfg_comp.cpp
|
| 124 |
+
@@ -292,8 +292,9 @@ void write_info(std::ostream&os,const InfoOpt&opt,const InfoRes&res){
|
| 125 |
+
w.key("leap_last");
|
| 126 |
+
w.value("2017-01-01");
|
| 127 |
+
w.key("delt_str");
|
| 128 |
+
- w.value("year<1970 or year>2026: em53; [1972,2026]: leap table; "
|
| 129 |
+
- "[1970,1972): legacy");
|
| 130 |
+
+ w.value("SMH2020 historical splines; USNO atomic/monthly "
|
| 131 |
+
+ "observations and predictions; Stephenson-Morrison "
|
| 132 |
+
+ "long-term extrapolation");
|
| 133 |
+
w.key("spk_cov");
|
| 134 |
+
if(res.has_cov){
|
| 135 |
+
w.obj_begin();
|
| 136 |
+
@@ -323,8 +324,9 @@ void write_info(std::ostream&os,const InfoOpt&opt,const InfoRes&res){
|
| 137 |
+
os<<"ephem.exists="<<(res.exists?"1":"0")<<"\n";
|
| 138 |
+
os<<"ephem.fsize_b="<<res.size<<"\n";
|
| 139 |
+
os<<"timescale.leap_last=2017-01-01\n";
|
| 140 |
+
- os<<"timescale.delt_str=year<1970 or year>2026: em53; "
|
| 141 |
+
- "[1972,2026]: leap table; [1970,1972): legacy\n";
|
| 142 |
+
+ os<<"timescale.delt_str=SMH2020 historical splines; USNO "
|
| 143 |
+
+ "atomic/monthly observations and predictions; "
|
| 144 |
+
+ "Stephenson-Morrison long-term extrapolation\n";
|
| 145 |
+
if(res.has_cov){
|
| 146 |
+
os<<"spk.jd_tstart="<<format_num(res.jd_start)<<"\n";
|
| 147 |
+
os<<"spk.jd_tdb_end="<<format_num(res.jd_end)<<"\n";
|
| 148 |
+
diff --git a/src/query/core/base.cpp b/src/query/core/base.cpp
|
| 149 |
+
index 10334f6..26ec2c9 100644
|
| 150 |
+
--- a/src/query/core/base.cpp
|
| 151 |
+
+++ b/src/query/core/base.cpp
|
| 152 |
+
@@ -386,6 +386,7 @@ EventRec mk_astro_rec(const AstroEvt&src,int tz_off){
|
| 153 |
+
out.jd_tdb=TimeScale::utc_to_tdb(src.jd_utc);
|
| 154 |
+
out.utc_iso=fmt_iso(src.jd_utc,0,true);
|
| 155 |
+
out.loc_iso=fmt_iso(src.jd_utc,tz_off,true);
|
| 156 |
+
+ out.detail=src.detail;
|
| 157 |
+
return out;
|
| 158 |
+
}
|
| 159 |
+
|
| 160 |
+
diff --git a/src/query/core/evt.cpp b/src/query/core/evt.cpp
|
| 161 |
+
index 40950f3..155497f 100644
|
| 162 |
+
--- a/src/query/core/evt.cpp
|
| 163 |
+
+++ b/src/query/core/evt.cpp
|
| 164 |
+
@@ -89,6 +89,10 @@ void wr_ejson(JsonWriter&w,const EventRec&ev,EphRead&eph,bool calc_eclipse=false
|
| 165 |
+
w.value(ev.utc_iso);
|
| 166 |
+
w.key("loc_iso");
|
| 167 |
+
w.value(ev.loc_iso);
|
| 168 |
+
+ if(!ev.detail.empty()){
|
| 169 |
+
+ w.key("detail");
|
| 170 |
+
+ w.value(ev.detail);
|
| 171 |
+
+ }
|
| 172 |
+
if(ev.kind=="lunar_eclipse"){
|
| 173 |
+
w.key("lunar_eclipse");
|
| 174 |
+
LunarEclipse ecl=calc_ecl_for_event(eph,ev);
|
| 175 |
+
diff --git a/src/spc_ephem.cpp b/src/spc_ephem.cpp
|
| 176 |
+
index df60fdf..e2ae0b1 100644
|
| 177 |
+
--- a/src/spc_ephem.cpp
|
| 178 |
+
+++ b/src/spc_ephem.cpp
|
| 179 |
+
@@ -2714,6 +2714,30 @@ struct SpkFile{
|
| 180 |
+
State6 o=to_ssb(observer,et,memo,active);
|
| 181 |
+
return t-o;
|
| 182 |
+
}
|
| 183 |
+
+
|
| 184 |
+
+ bool covers_to_ssb(int target,double et,
|
| 185 |
+
+ std::unordered_set<int>&active) const{
|
| 186 |
+
+ if(target==0){
|
| 187 |
+
+ return true;
|
| 188 |
+
+ }
|
| 189 |
+
+ if(!active.insert(target).second){
|
| 190 |
+
+ return false;
|
| 191 |
+
+ }
|
| 192 |
+
+ const SpkSeg*seg=pick_segment(target,et);
|
| 193 |
+
+ const bool covered=seg!=nullptr&&covers_to_ssb(seg->center,et,active);
|
| 194 |
+
+ active.erase(target);
|
| 195 |
+
+ return covered;
|
| 196 |
+
+ }
|
| 197 |
+
+
|
| 198 |
+
+ bool covers_state(int target,int observer,double et) const{
|
| 199 |
+
+ std::unordered_set<int> active;
|
| 200 |
+
+ active.reserve(16U);
|
| 201 |
+
+ if(!covers_to_ssb(target,et,active)){
|
| 202 |
+
+ return false;
|
| 203 |
+
+ }
|
| 204 |
+
+ active.clear();
|
| 205 |
+
+ return covers_to_ssb(observer,et,active);
|
| 206 |
+
+ }
|
| 207 |
+
};
|
| 208 |
+
|
| 209 |
+
namespace{
|
| 210 |
+
@@ -2887,6 +2911,25 @@ const std::vector<int>&series_object_ids(){
|
| 211 |
+
|
| 212 |
+
#endif
|
| 213 |
+
|
| 214 |
+
+std::vector<std::string>split_ephemeris_paths(const std::string&filepath){
|
| 215 |
+
+ std::vector<std::string> out;
|
| 216 |
+
+ std::size_t begin=0;
|
| 217 |
+
+ while(begin<=filepath.size()){
|
| 218 |
+
+ std::size_t end=filepath.find('|',begin);
|
| 219 |
+
+ std::string item=filepath.substr(
|
| 220 |
+
+ begin,end==std::string::npos?std::string::npos:end-begin);
|
| 221 |
+
+ if(item.empty()){
|
| 222 |
+
+ throw std::runtime_error("empty path in composite ephemeris");
|
| 223 |
+
+ }
|
| 224 |
+
+ out.push_back(std::move(item));
|
| 225 |
+
+ if(end==std::string::npos){
|
| 226 |
+
+ break;
|
| 227 |
+
+ }
|
| 228 |
+
+ begin=end+1;
|
| 229 |
+
+ }
|
| 230 |
+
+ return out;
|
| 231 |
+
+}
|
| 232 |
+
+
|
| 233 |
+
}
|
| 234 |
+
|
| 235 |
+
EphRead::EphRead(const std::string&path){
|
| 236 |
+
@@ -2932,18 +2975,28 @@ void EphRead::load_kern(){
|
| 237 |
+
return;
|
| 238 |
+
}
|
| 239 |
+
#endif
|
| 240 |
+
- if(!fs::exists(filepath)){
|
| 241 |
+
- throw std::runtime_error("ephemeris file not found: "+filepath);
|
| 242 |
+
- }
|
| 243 |
+
+ const std::vector<std::string> paths=split_ephemeris_paths(filepath);
|
| 244 |
+
+ for(const std::string&path : paths){
|
| 245 |
+
+ if(is_series_ephem(path)){
|
| 246 |
+
+ throw std::runtime_error(
|
| 247 |
+
+ "series backend cannot be mixed into a composite ephemeris");
|
| 248 |
+
+ }
|
| 249 |
+
+ if(!fs::exists(path)){
|
| 250 |
+
+ throw std::runtime_error("ephemeris file not found: "+path);
|
| 251 |
+
+ }
|
| 252 |
+
|
| 253 |
+
- std::error_code ec;
|
| 254 |
+
- auto fsize=fs::file_size(filepath,ec);
|
| 255 |
+
- if(ec||fsize==0){
|
| 256 |
+
- throw std::runtime_error("ephemeris file is not readable or empty: "+
|
| 257 |
+
- filepath);
|
| 258 |
+
+ std::error_code ec;
|
| 259 |
+
+ auto fsize=fs::file_size(path,ec);
|
| 260 |
+
+ if(ec||fsize==0){
|
| 261 |
+
+ throw std::runtime_error("ephemeris file is not readable or empty: "+
|
| 262 |
+
+ path);
|
| 263 |
+
+ }
|
| 264 |
+
+ kerns.push_back(acq_kernel(path));
|
| 265 |
+
}
|
| 266 |
+
-
|
| 267 |
+
- kern=acq_kernel(filepath);
|
| 268 |
+
+ if(kerns.empty()){
|
| 269 |
+
+ throw std::runtime_error("no ephemeris kernels were loaded");
|
| 270 |
+
+ }
|
| 271 |
+
+ kern=kerns.front();
|
| 272 |
+
kern_loaded=true;
|
| 273 |
+
|
| 274 |
+
if(use_series){
|
| 275 |
+
@@ -2967,8 +3020,11 @@ void EphRead::val_kern(){
|
| 276 |
+
if(use_series){
|
| 277 |
+
return;
|
| 278 |
+
}
|
| 279 |
+
- if(kern->obj_ids.empty()){
|
| 280 |
+
- throw std::runtime_error("No SPK segments found in ephemeris "+filepath);
|
| 281 |
+
+ for(const auto&item : kerns){
|
| 282 |
+
+ if(item->obj_ids.empty()){
|
| 283 |
+
+ throw std::runtime_error("No SPK segments found in ephemeris "+
|
| 284 |
+
+ item->filepath);
|
| 285 |
+
+ }
|
| 286 |
+
}
|
| 287 |
+
}
|
| 288 |
+
|
| 289 |
+
@@ -2987,7 +3043,19 @@ std::pair<PosKm3,VelKmSec3> EphRead::get_state_et_km(int target,int observer,
|
| 290 |
+
return {pos,vel};
|
| 291 |
+
}
|
| 292 |
+
#endif
|
| 293 |
+
- State6 st=kern->rel_state(target,observer,et_tdb);
|
| 294 |
+
+ State6 st;
|
| 295 |
+
+ bool found=false;
|
| 296 |
+
+ for(const auto&item : kerns){
|
| 297 |
+
+ if(item->covers_state(target,observer,et_tdb)){
|
| 298 |
+
+ st=item->rel_state(target,observer,et_tdb);
|
| 299 |
+
+ found=true;
|
| 300 |
+
+ break;
|
| 301 |
+
+ }
|
| 302 |
+
+ }
|
| 303 |
+
+ if(!found){
|
| 304 |
+
+ throw std::runtime_error(
|
| 305 |
+
+ "no composite SPK kernel covers the requested state");
|
| 306 |
+
+ }
|
| 307 |
+
PosKm3 pos(st.px,st.py,st.pz);
|
| 308 |
+
VelKmSec3 vel(st.vx,st.vy,st.vz);
|
| 309 |
+
return {pos,vel};
|
| 310 |
+
@@ -3034,7 +3102,13 @@ std::vector<int> EphRead::spk_objects(){
|
| 311 |
+
return series_object_ids();
|
| 312 |
+
}
|
| 313 |
+
#endif
|
| 314 |
+
- return kern->obj_ids;
|
| 315 |
+
+ std::vector<int> out;
|
| 316 |
+
+ for(const auto&item : kerns){
|
| 317 |
+
+ out.insert(out.end(),item->obj_ids.begin(),item->obj_ids.end());
|
| 318 |
+
+ }
|
| 319 |
+
+ std::sort(out.begin(),out.end());
|
| 320 |
+
+ out.erase(std::unique(out.begin(),out.end()),out.end());
|
| 321 |
+
+ return out;
|
| 322 |
+
}
|
| 323 |
+
|
| 324 |
+
std::vector<std::pair<double,double>> EphRead::spk_coverage(int obj){
|
| 325 |
+
@@ -3045,9 +3119,21 @@ std::vector<std::pair<double,double>> EphRead::spk_coverage(int obj){
|
| 326 |
+
return {};
|
| 327 |
+
}
|
| 328 |
+
#endif
|
| 329 |
+
- auto it=kern->cover_map.find(obj);
|
| 330 |
+
- if(it==kern->cover_map.end()){
|
| 331 |
+
- return {};
|
| 332 |
+
+ std::vector<std::pair<double,double>> out;
|
| 333 |
+
+ for(const auto&item : kerns){
|
| 334 |
+
+ auto it=item->cover_map.find(obj);
|
| 335 |
+
+ if(it!=item->cover_map.end()){
|
| 336 |
+
+ out.insert(out.end(),it->second.begin(),it->second.end());
|
| 337 |
+
+ }
|
| 338 |
+
}
|
| 339 |
+
- return it->second;
|
| 340 |
+
+ std::sort(out.begin(),out.end());
|
| 341 |
+
+ std::vector<std::pair<double,double>> merged;
|
| 342 |
+
+ for(const auto&span : out){
|
| 343 |
+
+ if(merged.empty()||span.first>merged.back().second){
|
| 344 |
+
+ merged.push_back(span);
|
| 345 |
+
+ }else{
|
| 346 |
+
+ merged.back().second=std::max(merged.back().second,span.second);
|
| 347 |
+
+ }
|
| 348 |
+
+ }
|
| 349 |
+
+ return merged;
|
| 350 |
+
}
|
| 351 |
+
diff --git a/tests/test_core_cli.cpp b/tests/test_core_cli.cpp
|
| 352 |
+
index b773345..cf5b021 100644
|
| 353 |
+
--- a/tests/test_core_cli.cpp
|
| 354 |
+
+++ b/tests/test_core_cli.cpp
|
| 355 |
+
@@ -116,6 +116,57 @@ TEST(CalendarSeries, YearHasTermsAndPhases){
|
| 356 |
+
EXPECT_GE(year.lun_phase.size()*4u,48u);
|
| 357 |
+
}
|
| 358 |
+
|
| 359 |
+
+TEST(CalendarSeries, LunarPhasesStayInTheirAnchoredLunation){
|
| 360 |
+
+#if LUNAR_ENABLE_SERIES_FALLBACK
|
| 361 |
+
+ EphRead eph("@series");
|
| 362 |
+
+ SolLunCal solver(eph);
|
| 363 |
+
+ for(int year : {1958,1977,1987}){
|
| 364 |
+
+ const YearResult result=solver.compute_year(year,nullptr);
|
| 365 |
+
+ ASSERT_GE(result.lun_phase.size(),12u)<<year;
|
| 366 |
+
+ for(std::size_t i=0;i<result.lun_phase.size();++i){
|
| 367 |
+
+ const MoonPhMon&phase=result.lun_phase[i];
|
| 368 |
+
+ const double nm=phase.new_moon.toUtcJD();
|
| 369 |
+
+ const double fq=phase.fst_qtr.toUtcJD();
|
| 370 |
+
+ const double fm=phase.full_moon.toUtcJD();
|
| 371 |
+
+ const double lq=phase.lst_qtr.toUtcJD();
|
| 372 |
+
+ EXPECT_LT(nm,fq)<<year<<" lunation "<<i;
|
| 373 |
+
+ EXPECT_LT(fq,fm)<<year<<" lunation "<<i;
|
| 374 |
+
+ EXPECT_LT(fm,lq)<<year<<" lunation "<<i;
|
| 375 |
+
+ if(i+1<result.lun_phase.size()){
|
| 376 |
+
+ EXPECT_LT(lq,result.lun_phase[i+1].new_moon.toUtcJD())
|
| 377 |
+
+ <<year<<" lunation "<<i;
|
| 378 |
+
+ }
|
| 379 |
+
+ }
|
| 380 |
+
+ }
|
| 381 |
+
+#else
|
| 382 |
+
+ GTEST_SKIP()<<"requires series fallback";
|
| 383 |
+
+#endif
|
| 384 |
+
+}
|
| 385 |
+
+
|
| 386 |
+
+TEST(Ephemeris, CompositePathsMatchSingleKernel){
|
| 387 |
+
+ if(!has_reference_bsp()){
|
| 388 |
+
+ GTEST_SKIP()<<"requires LUNAR_TEST_BSP or a repository BSP";
|
| 389 |
+
+ }
|
| 390 |
+
+ const std::string path=reference_bsp();
|
| 391 |
+
+ EphRead single(path);
|
| 392 |
+
+ EphRead composite(path+"|"+path);
|
| 393 |
+
+ const auto coverage=single.spk_coverage(single.EARTH);
|
| 394 |
+
+ ASSERT_FALSE(coverage.empty());
|
| 395 |
+
+ const double et=(coverage.front().first+coverage.front().second)*0.5;
|
| 396 |
+
+ const auto expected=single.get_state_et_km(single.SUN,single.EARTH,et);
|
| 397 |
+
+ const auto actual=composite.get_state_et_km(
|
| 398 |
+
+ composite.SUN,composite.EARTH,et);
|
| 399 |
+
+ EXPECT_DOUBLE_EQ(expected.first.x,actual.first.x);
|
| 400 |
+
+ EXPECT_DOUBLE_EQ(expected.first.y,actual.first.y);
|
| 401 |
+
+ EXPECT_DOUBLE_EQ(expected.first.z,actual.first.z);
|
| 402 |
+
+ EXPECT_DOUBLE_EQ(expected.second.x,actual.second.x);
|
| 403 |
+
+ EXPECT_DOUBLE_EQ(expected.second.y,actual.second.y);
|
| 404 |
+
+ EXPECT_DOUBLE_EQ(expected.second.z,actual.second.z);
|
| 405 |
+
+ EXPECT_EQ(single.spk_objects(),composite.spk_objects());
|
| 406 |
+
+ EXPECT_EQ(single.spk_coverage(single.EARTH),
|
| 407 |
+
+ composite.spk_coverage(composite.EARTH));
|
| 408 |
+
+}
|
| 409 |
+
+
|
| 410 |
+
TEST(CoreGanzhi, ThinApisMatchDayAndCApi){
|
| 411 |
+
if(!has_test_ephem()){
|
| 412 |
+
GTEST_SKIP()<<"requires series fallback or LUNAR_TEST_BSP";
|
| 413 |
+
@@ -1006,6 +1057,12 @@ TEST(CliExport, FullJsonIncludesEventsEclipsesAstroAndAllHuangli){
|
| 414 |
+
EXPECT_NE(txt.find("\"greg_date\":\"2025-09-01\""),std::string::npos);
|
| 415 |
+
EXPECT_NE(txt.find("\"lunar_date\""),std::string::npos);
|
| 416 |
+
EXPECT_NE(txt.find("\"ganzhi\""),std::string::npos);
|
| 417 |
+
+ EXPECT_NE(txt.find("\"elongation_rad\""),std::string::npos);
|
| 418 |
+
+ EXPECT_NE(txt.find("\"moon_longitude_rad\""),std::string::npos);
|
| 419 |
+
+ EXPECT_NE(txt.find("\"moon_longitude_rate_rad_per_day\""),std::string::npos);
|
| 420 |
+
+ EXPECT_NE(txt.find("\"sun_longitude_rad\""),std::string::npos);
|
| 421 |
+
+ EXPECT_NE(txt.find("\"sun_longitude_rate_rad_per_day\""),std::string::npos);
|
| 422 |
+
+ EXPECT_NE(txt.find("\"detail\":\"state=retrograde\""),std::string::npos);
|
| 423 |
+
EXPECT_NE(txt.find("\"events\""),std::string::npos);
|
| 424 |
+
EXPECT_NE(txt.find("\"eclipses\""),std::string::npos);
|
| 425 |
+
EXPECT_NE(txt.find("\"lunar_eclipse\""),std::string::npos);
|
sample/2026-08/metadata/v1/source_web_data/DATA_FORMAT.md
CHANGED
|
@@ -117,6 +117,13 @@ boundary, ganzhi nodes, 建除, duty god/tag, clashes, harmonies, Pengzu, nayin,
|
|
| 117 |
five elements, fetal god, meridian, direction fields, lunar mansions, gods,
|
| 118 |
activities, Yi/Ji level/rule, equation/true-solar time, and all 13 hour slots.
|
| 119 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 120 |
Profile defaults come from `make_hli_rule_set`; the generator does not collapse
|
| 121 |
their distinct boundaries. UTC+08 civil midnight is not substituted for a
|
| 122 |
profile's Hour-23/Hour-0 Huangli boundary.
|
|
|
|
| 117 |
five elements, fetal god, meridian, direction fields, lunar mansions, gods,
|
| 118 |
activities, Yi/Ji level/rule, equation/true-solar time, and all 13 hour slots.
|
| 119 |
|
| 120 |
+
Current CCC exports distinguish `bazi_month` (the month pillar used by the
|
| 121 |
+
four-pillars calculation) from `god_month` (the month used by the profile's
|
| 122 |
+
god/sha rules), and include `god_month_basis`. Early v1 shards used the
|
| 123 |
+
ambiguous key `month` for what is now `bazi_month`; readers of a mixed v1 tree
|
| 124 |
+
should resolve the month pillar as `bazi_month ?? month`. The legacy value is
|
| 125 |
+
not a third month concept and is exactly equal to the current `bazi_month`.
|
| 126 |
+
|
| 127 |
Profile defaults come from `make_hli_rule_set`; the generator does not collapse
|
| 128 |
their distinct boundaries. UTC+08 civil midnight is not substituted for a
|
| 129 |
profile's Hour-23/Hour-0 Huangli boundary.
|
sample/2026-08/metadata/v1/source_web_data/VALIDATION.md
CHANGED
|
@@ -3,7 +3,7 @@
|
|
| 3 |
- Requested range: 1950..17000
|
| 4 |
- Verified years: 15051
|
| 5 |
- Failed years: 0
|
| 6 |
-
- Resumed from validated markers:
|
| 7 |
- Checks: 14
|
| 8 |
|
| 9 |
The final pass verifies every stored Brotli and gzip artifact, SHA-256, calendar day, four Huangli profiles, eclipse/astro reference, and eclipse contact ordering.
|
|
|
|
| 3 |
- Requested range: 1950..17000
|
| 4 |
- Verified years: 15051
|
| 5 |
- Failed years: 0
|
| 6 |
+
- Resumed from validated markers: 14900
|
| 7 |
- Checks: 14
|
| 8 |
|
| 9 |
The final pass verifies every stored Brotli and gzip artifact, SHA-256, calendar day, four Huangli profiles, eclipse/astro reference, and eclipse contact ordering.
|
sample/2026-08/metadata/v1/source_web_data/manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
| 1 |
-
{"schema_version":1,"generator":"CalcChineseCalendar web_data streaming finalizer","generator_version":"1.0.3","validator_version":"web-finalize-1","generator_git_commit":"
|
|
|
|
| 1 |
+
{"schema_version":1,"generator":"CalcChineseCalendar web_data streaming finalizer","generator_version":"1.0.3","validator_version":"web-finalize-1","generator_git_commit":"010b7aa+patch-d092e58d9474","source_provenance":{"git_commit":"010b7aaf8d9d824144c389f7d487cd88e62f0c8e"},"source_version":"test","state_provenance":{"base_generator_versions":{"1.0.2":13841,"1.0.3":1210},"distinct_base_config_fingerprints":6,"eclipse_repair_versions":{"solar-eclipse-full-v2":14900,"timescale-phase-export-regeneration-v1":151},"note":"Base year provenance is retained; complete solar-eclipse refresh provenance is recorded per state."},"generated_at":"2026-08-24T06:47:06Z","range":{"from":1950,"to":17000},"timezone":"+08:00","lunar_day_timezone":"+08:00","huangli_longitude_deg":120,"ephemeris":[{"id":"de441_part_1","path":"D:\\cdg\\de441_part-1.bsp","bytes":1651119104,"sha256":"13757827f5db41b835a24bbd637488636ce79a8ca754062fed17844f7d5b618e","jd_tdb_start":-3100015.5,"jd_tdb_end":2440432.5},{"id":"de441_part_2","path":"D:\\cdg\\de441_part-2.bsp","bytes":1656830976,"sha256":"3abb17dae2d78dd34880377544aacb54892104a0d4462b322cb9f4454d4887f6","jd_tdb_start":2440400.5,"jd_tdb_end":8000016.5}],"delta_t_model":"SMH2020 historical splines; USNO atomic/monthly observations and predictions; Stephenson-Morrison quadratic-periodic long-term extrapolation","time_scale_policy":{"tdb_tt":"treated as equal at current library precision","delta_t":"TT-UT1","pre_1972_civil_utc":"UT1 approximation","from_1972_utc":"TAI plus built-in leap-second table","future_utc":"last known TAI-UTC offset held fixed; not a leap-second prediction"},"huangli_profiles":["folk","ziping","purple","xieji"],"compression":["brotli","gzip"],"dictionary_version":1,"counts":{"years":15051,"days":5497265,"solar_terms":361225,"lunar_phases":744621,"festivals":195664,"solar_eclipses":35735,"lunar_eclipses":36159,"astro_events":218433381},"sizes":{"raw_json_bytes":82325362558,"encoded_bytes":{"json":0,"brotli":11020066749,"gzip":12800979074},"by_category_encoded_bytes":{"calendar":{"json":0,"brotli":2807015410,"gzip":4054709530},"eclipse":{"json":0,"brotli":77046465,"gzip":82935527},"astro":{"json":0,"brotli":8136004874,"gzip":8663334017}},"average_raw_bytes_per_year":5469760.318782805,"average_raw_calendar_month_bytes":145504.22057781322,"maximum_raw_calendar_month_bytes":163948,"brotli_ratio":0.133859923680702,"gzip_ratio":0.15549253202476251},"cdn":{"cache_control":"public, max-age=31536000, immutable"}}
|
sample/2026-08/metadata/v1/source_web_data/validation_report.json
CHANGED
|
@@ -1 +1 @@
|
|
| 1 |
-
{"v":1,"validator_version":"web-finalize-1","range":{"from":1950,"to":17000},"checks":["generation_state_verified","artifact_size_and_sha256","brotli_and_gzip_json_parse","compressed_representation_identity","schema_version","twelve_month_inventory","civil_day_continuity_and_count","event_local_date_and_second","huangli_four_profiles","unique_eclipse_and_astro_ids","eclipse_contact_order","no_orphan_event_references","finite_json_numbers","safe_relative_artifact_paths"],"passed_years":15051,"cached_verified_years":
|
|
|
|
| 1 |
+
{"v":1,"validator_version":"web-finalize-1","range":{"from":1950,"to":17000},"checks":["generation_state_verified","artifact_size_and_sha256","brotli_and_gzip_json_parse","compressed_representation_identity","schema_version","twelve_month_inventory","civil_day_continuity_and_count","event_local_date_and_second","huangli_four_profiles","unique_eclipse_and_astro_ids","eclipse_contact_order","no_orphan_event_references","finite_json_numbers","safe_relative_artifact_paths"],"passed_years":15051,"cached_verified_years":14900,"failed_years":0,"source_comparison_days":5497265,"errors":[],"warnings":["Far-future UT1 uses the repository delta-T extrapolation; projected UTC holds the last known leap-second offset fixed.","Far-future UTC+08 civil dates are a stable serialization convention, not observed or legislated future civil time.","Transit and occultation events require an explicitly configured observer.","Generation-time lossless reconstruction is attested by each verified state; finalization rechecks serialized artifacts and references."]}
|