Update APCalendar.java

APCSLowell · May 4, 2024 · 130bde8 · 130bde8
1 parent f70c960
commit 130bde8
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/main/java/APCalendar.java b/src/main/java/APCalendar.java
@@ -13,8 +13,9 @@ private static boolean isLeapYear(int year)
   public static int numberOfLeapYears(int year1, int year2)
   { 
     int count = 0;
-    for(int i = year1; i < year2; i++){
-      if(isLeapYear(i) == true){
+    int count = 0;
+    for (int i = year1; i<=year2; i++){
+      if (isLeapYear(i)){
         count++;
       }
     }
@@ -56,9 +57,7 @@ private static int dayOfYear(int month, int day, int year)
    */
   public static int dayOfWeek(int month, int day, int year)
   {
-    int first = firstDayOfYear(year);
-    int n = dayOfWeek(month,day,year);
-    int day = (first + n - 1) % 7;
-    return day;
+   int additionalDays = dayOfYear(month, day, year) - 1;
+    return (firstDayOfYear(year) + additionalDays) % 7;
   }
 }