Merge branch 'master' of https://github.com/Trashtalk217/algorithm-archive into aaa-py-4

Author: Trashtalk217

contents/computus/code/crystal/gauss_easter.cr

@@ -0,0 +1,64 @@
+defcomputus(year, servois =false)
+# Year's position on the 19 year metonic cycle
+ a = year %19
+
+# Century index
+ k = year //100
+
+# Shift of metonic cycle, add a day offset every 300 years
+p= (13+8* k) //25
+
+# Correction for non-observed leap days
+ q = k //4
+
+# Correction to starting point of calculation each century
+ m = (15-p+ k - q) %30
+
+# Number of days from March 21st until the full moon
+ d = (19* a + m) %30
+
+# Returning if user wants value for Servois' table
+if servois
+return (21+ d) %31
+end
+
+# Finding the next Sunday
+# Century-based offset in weekly calculation
+ n = (4+ k - q) %7
+
+# Correction for leap days
+ b = year %4
+ c = year %7
+
+# Days from d to next Sunday
+ e = (2* b +4* c +6* d + n) %7
+
+# Historical corrections for April 26 and 25
+if (d ==29&& e ==6) || (d ==28&& e ==6&& a >10)
+ e =-1
+end
+
+# Determination of the correct month for Easter
+if (22+ d + e >31)
+return"April "+ (d + e -9).to_s
+else
+return"March "+ (22+ d + e).to_s
+end
+end
+
+# Here, we will output the date of the Paschal full moon
+# (using Servois notation), and Easter for 2020-2030
+defmain
+ a = (2020..2030).to_a
+ servois_numbers = a.map{|y| computus(y, servois =true) }
+ easter_dates = a.map{|y| computus(y) }
+
+puts"The following are the dates of the Paschal full moon (using Servois "+
+"notation) and the date of Easter for 2020-2030 AD:"
+puts"Year\tServois number\tEaster"
+ a.each_index{|i|
+puts"#{a[i]}\t#{servois_numbers[i]}\t\t\t\t#{easter_dates[i]}"
+ }
+end
+
+main

contents/computus/code/python/gauss_easter.py

@@ -0,0 +1,55 @@
+defcomputus(year, servois=False):
+# Year's position on the 19-year metonic cycle
+a=year%19
+
+# Century index
+k=year//100
+
+# Shift of metonic cycle, add a day offset every 300 years
+p= (13+8*k) //25
+
+# Correction for non-observed leap days
+q=k//4
+
+# Correction to starting point of calculation each century
+M= (15-p+k-q) %30
+
+# Number of days from March 21st until the full moon
+d= (19*a+M) %30
+
+# Returning if user wants value for Servois' table
+ifservois:
+return (21+d) %31
+
+# Finding the next Sunday
+# Century-based offset in weekly calculation
+N= (4+k-q) %7
+
+# Correction for leap days
+b=year%4
+c=year%7
+
+# Days from d to next Sunday
+e= (2*b+4*c+6*d+N) %7
+
+# Historical corrections for April 26 and 25
+if (d==29ande==6) or (d==28ande==6anda>10):
+e=-1
+
+# Determination of the correct month for Easter
+if22+d+e>31:
+return"April "+str(d+e-9)
+else:
+return"March "+str(22+d+e)
+
+
+# Here, we will output the date of the Paschal full moon
+# (using Servois notation), and Easter for 2020-2030
+
+print(
+"The following are the dates of the Paschal full moon (using Servois",
+"notation) and the date of Easter for 2020-2030 AD:",
+)
+print("Year\tServois number\tEaster")
+foryearinrange(2020, 2031):
+print(f"{year}\t{computus(year, servois=True)}\t{computus(year)}")

contents/contents/computus/code/julia/gauss_easter.jl

@@ -2,15 +2,15 @@ function computus(year; servois=false)
 
 # Year's position on the 19 year metonic cycle
  a =mod(year, 19)
-
+
 # Century index
- k =floor(Int, year/100)
+ k =fld(year, 100)
 
 # Shift of metonic cycle, add a day offset every 300 years
- p =floor(Int, (13+8* k) /25)
+ p =fld(13+8* k, 25)
 
 # Correction for non-observed leap days
- q =floor(Int, k /4)
+ q =fld(k,4)
 
 # Correction to starting point of calculation each century
  M =mod(15- p + k - q, 30)
@@ -20,7 +20,7 @@ function computus(year; servois=false)
 
 # Returning if user wants value for Servois' table
 if servois
-returnmod(21+d,31)
+returnmod(21+d,31)
 end
 
 # Finding the next Sunday
@@ -40,24 +40,23 @@ function computus(year; servois=false)
 end
 
 # Determination of the correct month for Easter
-if(22+ d + e >31)
-return"April "*string(d + e -9)
+if(22+ d + e >31)
+return"April "*string(d + e -9)
 else
-return"March "*string(22+d+e)
+return"March "*string(22+ d +e)
 end
 end
 
 # Here, we will output the date of the Paschal full moon
 # (using Servois notation), and Easter for 2020-2030
 
-a =[i for i =2020:2030]
-servois_numbers =computus.(a;servois=true)
+a =collect(2020:2030)
+servois_numbers =computus.(a;servois=true)
 easter_dates =computus.(a)
 
-println("The following are the dates of the Paschal full moon (using Servois "*
+println("The following are the dates of the Paschal full moon (using Servois "*
 "notation) and the date of Easter for 2020-2030 AD:")
-println("Year Servois number Easter")
+println("Year\tServois number\tEaster")
 for i =1:length(a)
-println(string(a[i])*"\t"*string(servois_numbers[i])*"\t\t"*
-string(easter_dates[i]))
+println("$(a[i])\t$(servois_numbers[i])\t\t\t\t$(easter_dates[i])")
 end

contents/contents/computus/computus.md

@@ -205,11 +205,11 @@ As an example, look at the following table
 
 | January 1st | Day of the week | Special considerations |
 | ----------- | --------------- | ---------------------- |
-| 2017 | Sunday |None |
-| 2018 | Monday |None |
-| 2019 | Tuesday |None |
-| 2020 | Wednesday |Leap Year |
-| 2021 | Friday |None |
+| 2017 | Sunday | None|
+| 2018 | Monday | None|
+| 2019 | Tuesday | None|
+| 2020 | Wednesday | Leap Year|
+| 2021 | Friday | None|
 
 Simply put, every year we should subtract one day of the week, but on leap years, we should subtract 2.
 To keep tabs on this, we need two separate counts,
@@ -281,6 +281,10 @@ For now, we have the code outputting a tuple of $$d$$ and $$e$$, so users can us
 {% method %}
 {% sample lang="jl" %}
 [import, lang:"julia"](code/julia/gauss_easter.jl)
+{% sample lang="py" %}
+[import, lang:"python"](code/python/gauss_easter.py)
+{% sample lang="crystal" %}
+[import, lang:"crystal"](code/crystal/gauss_easter.cr)
 {% endmethod %}