Skip to content

Add Dangi to generate_reference_years, fix reference year checking test #7013

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 1, 2025
Merged

Add Dangi to generate_reference_years, fix reference year checking test #7013

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f363eea
Fix reference year generation test, update
Manishearth Sep 30, 2025
0150ddb
Add month conditions to reference year tests
Manishearth Oct 1, 2025
0e3806c
nit, regen
robertbastian Oct 1, 2025
49c9dc6
fix boundary
robertbastian Oct 1, 2025
5e25d42
fmt
robertbastian Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 71 additions & 66 deletions components/calendar/src/cal/chinese.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ impl Rules for Dangi {
(2, true, false) => 1947,
(2, true, true) => 1765,
(3, false, false) => 1972,
(3, false, true) => 1966,
(3, false, true) => 1968,
(3, true, false) => 1966,
(3, true, true) => 1955,
(4, false, false) => 1972,
Expand Down Expand Up @@ -378,18 +378,18 @@ impl Rules for Dangi {
(10, false, false) => 1972,
(10, false, true) => 1972,
(10, true, false) => 1984,
(10, true, true) => -4098,
(10, true, true) => -3946,
// Dec 31, 1972 is 1972-M11-26, dates after that
// are in the next year
(11, false, false) if day > 26 => 1971,
(11, false, false) => 1972,
(11, false, true) => 1969,
(11, false, true) => 1972,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@robertbastian This is incorrect: This date is Jan 4, 1973, which is after Dec 31, 1972.

The algorithm needs to look backwards from Dec 31.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately your code doesn't currently handle the Dec 31 boundary so this still needs manual edits.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah you had this like this in your PR so I changed the code to produce that (49c9dc6). I thought it needs to be a strict comparison

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I see! Yeah, that works.

Hadn't looked at the next commit.

(11, true, false) => 2033,
(11, true, true) => -2173,
(12, false, false) => 1971,
(12, false, true) => 1971,
(12, true, false) => 1403,
(12, true, true) => -180,
(12, true, false) => 1889,
(12, true, true) => -1182,
_ => return Err(DateError::UnknownMonthCode(month_code)),
};
Ok(self.year_data(extended))
Expand Down Expand Up @@ -2287,71 +2287,76 @@ mod test {
#[test]
#[ignore]
fn generate_reference_years() {
use crate::Date;
let calendar = crate::cal::LunarChinese::new_china();
let reference_year_end = Date::from_rata_die(
crate::cal::abstract_gregorian::LAST_DAY_OF_REFERENCE_YEAR,
calendar,
);
let year_1900_start = Date::try_new_gregorian(1900, 1, 1)
.unwrap()
.to_calendar(calendar);
let year_2035_end = Date::try_new_gregorian(2035, 12, 31)
.unwrap()
.to_calendar(calendar);
for month in 1..=12 {
for leap in [false, true] {
'outer: for long in [false, true] {
for (start_year, start_month, end_year, end_month, by) in [
(
reference_year_end.extended_year(),
reference_year_end.month().month_number(),
year_1900_start.extended_year(),
year_1900_start.month().month_number(),
-1,
),
(
reference_year_end.extended_year(),
reference_year_end.month().month_number(),
year_2035_end.extended_year(),
year_2035_end.month().month_number(),
1,
),
(
year_1900_start.extended_year(),
year_1900_start.month().month_number(),
-10000,
1,
-1,
),
] {
let mut year = start_year;
while year * by < end_year * by {
if year == start_year && month as i32 * by < start_month as i32 * by
|| year == end_year && month as i32 * by > end_month as i32 * by
{
year += by;
continue;
}
let data = China.year_data(year);
let leap_month = data.leap_month().unwrap_or(15);
let days_in_month = data.days_in_month({
if leap && month + 1 == leap_month {
month + 1
} else {
month + (month + 1 > leap_month) as u8
generate_reference_years_for(LunarChinese::new_china());
generate_reference_years_for(LunarChinese::new_dangi());
fn generate_reference_years_for<R: Rules + Copy>(calendar: LunarChinese<R>) {
use crate::Date;

println!("Reference years for {calendar:?}:");
let reference_year_end = Date::from_rata_die(
crate::cal::abstract_gregorian::LAST_DAY_OF_REFERENCE_YEAR,
calendar,
);
let year_1900_start = Date::try_new_gregorian(1900, 1, 1)
.unwrap()
.to_calendar(calendar);
let year_2035_end = Date::try_new_gregorian(2035, 12, 31)
.unwrap()
.to_calendar(calendar);
for month in 1..=12 {
for leap in [false, true] {
'outer: for long in [false, true] {
for (start_year, start_month, end_year, end_month, by) in [
(
reference_year_end.extended_year(),
reference_year_end.month().month_number(),
year_1900_start.extended_year(),
year_1900_start.month().month_number(),
-1,
),
(
reference_year_end.extended_year(),
reference_year_end.month().month_number(),
year_2035_end.extended_year(),
year_2035_end.month().month_number(),
1,
),
(
year_1900_start.extended_year(),
year_1900_start.month().month_number(),
-10000,
1,
-1,
),
] {
let mut year = start_year;
while year * by < end_year * by {
if year == start_year && month as i32 * by < start_month as i32 * by
|| year == end_year && month as i32 * by > end_month as i32 * by
{
year += by;
continue;
}
let data = calendar.0.year_data(year);
let leap_month = data.leap_month().unwrap_or(15);
let days_in_month = data.days_in_month({
if leap && month + 1 == leap_month {
month + 1
} else {
month + (month + 1 > leap_month) as u8
}
});
if (!long || (days_in_month == 30))
&& (!leap || month + 1 == leap_month)
{
println!("({month}, {leap:?}, {long:?}) => {year},");
continue 'outer;
}
});
if (!long || (days_in_month == 30))
&& (!leap || month + 1 == leap_month)
{
println!("({month}, {leap:?}, {long:?}) => {year},");
continue 'outer;
year += by;
}
year += by;
}
println!("({month}, {leap:?}, {long:?}) => todo!(),")
}
println!("({month}, {leap:?}, {long:?}) => todo!(),")
}
}
}
Expand Down
Loading
Loading