Skip to content
New issue

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

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

ICU-22736 Improve Persian Calendar #3163

Merged
merged 2 commits into from
Dec 7, 2024
+995 −13
Merged

ICU-22736 Improve Persian Calendar #3163

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3255e97
ICU-22736 Fix Persian calendar
FrankYFTang Sep 13, 2024
f96b01a
ICU-22736 Address Markus' feedback
FrankYFTang Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
ICU-22736 Address Markus' feedback
@FrankYFTang
FrankYFTang committed Dec 6, 2024
commit f96b01acb3011a142a48c3b40dbfc179cec75fac
4 changes: 2 additions & 2 deletions icu4c/source/i18n/persncal.cpp
View file
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ static const int32_t kPersianCalendarLimits[UCAL_FIELD_COUNT][4] = {

namespace { // anonymous

static icu::UnicodeSet *gLeapCorrection = nullptr;
static const icu::UnicodeSet *gLeapCorrection = nullptr;
static icu::UInitOnce gCorrectionInitOnce {};
static int32_t gMinCorrection;
} // namespace
@@ -96,7 +96,7 @@ static void U_CALLCONV initLeapCorrection() {
for (auto year : nonLeapYears) {
prefab.add(year);
}
gLeapCorrection = prefab.cloneAsThawed();
gLeapCorrection = prefab.cloneAsThawed()->freeze();
ucln_i18n_registerCleanup(UCLN_I18N_PERSIAN_CALENDAR, calendar_persian_cleanup);
}
const icu::UnicodeSet* getLeapCorrection() {
46 changes: 28 additions & 18 deletions icu4j/main/core/src/main/java/com/ibm/icu/util/PersianCalendar.java
View file
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@

package com.ibm.icu.util;

import java.util.BitSet;
import java.util.Date;
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;

@@ -95,22 +95,32 @@ public class PersianCalendar extends Calendar {

private static final int PERSIAN_EPOCH = 1948320;

private static final int NON_LEAP_YEARS[] = {
1502, 1601, 1634, 1667, 1700, 1733, 1766, 1799, 1832, 1865, 1898, 1931, 1964, 1997, 2030, 2059,
2063, 2096, 2129, 2158, 2162, 2191, 2195, 2224, 2228, 2257, 2261, 2290, 2294, 2323, 2327, 2356,
2360, 2389, 2393, 2422, 2426, 2455, 2459, 2488, 2492, 2521, 2525, 2554, 2558, 2587, 2591, 2620,
2624, 2653, 2657, 2686, 2690, 2719, 2723, 2748, 2752, 2756, 2781, 2785, 2789, 2818, 2822, 2847,
2851, 2855, 2880, 2884, 2888, 2913, 2917, 2921, 2946, 2950, 2954, 2979, 2983, 2987,
};
private static final class NonLeapYears {
private static final int NON_LEAP_YEARS[] = {
1502, 1601, 1634, 1667, 1700, 1733, 1766, 1799, 1832, 1865, 1898, 1931, 1964, 1997, 2030, 2059,
2063, 2096, 2129, 2158, 2162, 2191, 2195, 2224, 2228, 2257, 2261, 2290, 2294, 2323, 2327, 2356,
2360, 2389, 2393, 2422, 2426, 2455, 2459, 2488, 2492, 2521, 2525, 2554, 2558, 2587, 2591, 2620,
2624, 2653, 2657, 2686, 2690, 2719, 2723, 2748, 2752, 2756, 2781, 2785, 2789, 2818, 2822, 2847,
2851, 2855, 2880, 2884, 2888, 2913, 2917, 2921, 2946, 2950, 2954, 2979, 2983, 2987,
};
private int minYear = NON_LEAP_YEARS[0];
private int maxYear = NON_LEAP_YEARS[NON_LEAP_YEARS.length - 1];
private BitSet offsetYears;

public NonLeapYears() {
offsetYears = new BitSet(maxYear - minYear + 1);
for (int nonLeap : NON_LEAP_YEARS) {
offsetYears.set(nonLeap - minYear);
}
}

private static Set<Integer> LEAP_CORRECTION = null;
{
Set<Integer> prefab = new HashSet<Integer>(NON_LEAP_YEARS.length);
for (int nonLeap : NON_LEAP_YEARS) {
prefab.add(nonLeap);
public boolean contains(int year) {
return minYear <= year && year <= maxYear && offsetYears.get(year - minYear);
}
LEAP_CORRECTION = prefab;
}

private static NonLeapYears LEAP_CORRECTION = new NonLeapYears();

//-------------------------------------------------------------------------
// Constructors...
//-------------------------------------------------------------------------
@@ -330,10 +340,10 @@ protected int handleGetLimit(int field, int limitType) {
*/
private final static boolean isLeapYear(int year)
{
if (year >= NON_LEAP_YEARS[0] && LEAP_CORRECTION.contains(year)) {
if (LEAP_CORRECTION.contains(year)) {
return false;
}
if (year > NON_LEAP_YEARS[0] && LEAP_CORRECTION.contains(year-1)) {
if (LEAP_CORRECTION.contains(year-1)) {
return true;
}
int[] remainder = new int[1];
@@ -426,7 +436,7 @@ protected int handleGetExtendedYear() {

private static long firstJulianOfYear(int year) {
long julianDay = 365L * (year - 1L) + floorDivide(8L * year + 21, 33L);
if (year > NON_LEAP_YEARS[0] && LEAP_CORRECTION.contains(year-1)) {
if (LEAP_CORRECTION.contains(year-1)) {
julianDay--;
}
return julianDay;
@@ -458,7 +468,7 @@ protected void handleComputeFields(int julianDay) {
long farvardin1 = firstJulianOfYear(year);

dayOfYear = (int)(daysSinceEpoch - farvardin1); // 0-based
if (dayOfYear == 365 && year >= NON_LEAP_YEARS[0] && LEAP_CORRECTION.contains(year)) {
if (dayOfYear == 365 && LEAP_CORRECTION.contains(year)) {
year++;
dayOfYear = 0;
}