Commit: 6ec616a8a188099b49d272686d925d7be6c18549 - xhilr_calendar (git)

Functions for working with the idealized calendar of Planet Xhilr

Commit MetaInfo

• Revisión: 6ec616a8a188099b49d272686d925d7be6c18549 (tree)
• Tiempo: 2017-06-13 18:04:11
• Autor: Joel Matthew Rees <joel.rees@gmai...>
• Commiter: Joel Matthew Rees

Log Message

more on cycle counting for synthetic division

Cambiar Resumen

• modified: econmonths.fs

Diferencia incremental

--- a/econmonths.fs
+++ b/econmonths.fs
@@ -85,8 +85,8 @@
 ( : UM/MOD M/MOD DROP ; ( uddividend udivisor --- uremainder uquotient )
 
 : S>D S->D ; ( n --- d : Modern name for single-to-double. )
-: NEGATE MINUS ; ( n --- -n : Modern name for single-to-double. )
-: DNEGATE DMINUS ; ( d --- -d : Modern name for single-to-double. )
+: NEGATE MINUS ; ( n --- -n : Modern name for numeric negation. )
+: DNEGATE DMINUS ; ( d --- -d : Modern name for double number negation. )
 
 : 2DUP  OVER OVER ; ( d --- d d : DUPlicate top double cell on stack. )
 
@@ -325,9 +325,6 @@ SP@ SP@ - ABS CONSTANT CELLWIDTH
 (  THEN )
 ( ; )
 
-( : UMQ* ( uqdividend uddivisor --- udremainder uqquotient )
-(  0. 2SWAP )
-
 ( Make things easier to read. )
 ( Infix will be confusing here, too. )
 
@@ -675,15 +672,15 @@ RD2LCYCLE 16 * CONSTANT NUCYCLE ( numerator: 7760 )
 ( Fake DCONSTANT: )
 : SMPERIOD10976 [ SMPERIODINT DECYCLE UM* SMPERIODFRAC10976 0 D+ SWAP ] LITERAL LITERAL ; 
 ( 28 9645 / 10976 == 316973 / 10976 )
-( 
 
 
 0 CONSTANT SMOFFINT ( Slow moon offset at year 0 day 0, integer part. )
 0 CONSTANT SMOFFFRAC10976 ( Fractional part. )
 
-0 VARIABLE SMSTATEINT ( Slow moon state integer part. )
-0 SMSTATEINT ! ( Initialize cleared. Modern Forths leave a zero. )
-0 VARIABLE SMSTATEFRAC10976 ( Fractional part. )
+0 VARIABLE SMSTATEINT ( Slow moon state integer part. Modern Forths leave a zero. )
+0 SMSTATEINT ! 0 , ( Initialize cleared, make double variable. )
+0 VARIABLE SMSTATEFRAC10976 ( Fractional part. Modern Forths leave a zero. )
+0 SMSTATEFRAC10976 ! 0 , ( Initialize cleared, make double variable. )
 
 
 ( The smaller moon orbits their world in just under seven and one eighth days, )
@@ -697,36 +694,42 @@ RD2LCYCLE 16 * CONSTANT NUCYCLE ( numerator: 7760 )
 0 CONSTANT FMOFFINT ( Fast moon offset at year 0 day 0, integer part. )
 0 CONSTANT FMOFFFRAC10976 ( Fractional part. )
 
-0 VARIABLE FMSTATEINT ( Fast moon state integer part. )
-0 FMSTATEINT ! ( Initialize cleared. Modern Forths leave a zero. )
-0 VARIABLE FMSTATEFRAC10976 ( Fractional part. )
+0 VARIABLE FMSTATEINT ( Fast moon state integer part. Modern Forths leave a zero. )
+0 FMSTATEINT ! 0 , ( Initialize cleared, make double variable. )
+0 VARIABLE FMSTATEFRAC10976 ( Fractional part. Modern Forths leave a zero. )
+0 FMSTATEFRAC10976 ! 0 , ( Initialize cleared, make double variable. )
 
 
-: WSTYCYCLES ( year --- ddays ) ( Start the weekday counter for the year, keep the days. )
+: WSTYCYCLES ( year --- ) ( Start the weekday counter for the year, keep the days. )
   DTY 2DUP DAYCOUNT D!
-  2DUP WKDAYOFFSET 0 D- DPWK JM/MOD 2DROP DOWKSTATE !
+  WKDAYOFFSET 0 D- DPWK JM/MOD 2DROP DOWKSTATE !
 ;
 
 : SSTYCYCLES ( ddays --- ) ( Start the slowmoon cycle counter for the year. )
-  SMOFFINT SMSTATEINT !
-  SMOFFFRAC10976 SMSTATEFRAC10976 !
-
-  2DUP DECYCLE UDS*  
-  
+  DECYCLE UDS* DROP SMPERIOD10976 DROP JM/MOD >R >R S>D R> R> ( 32-bit, 64-bit )
+(  DECYCLE S>D UMD* SMPERIOD10976 UD/MOD ( 16-bit )
+  2SWAP SMOFFFRAC10976 S>D D+
+  2DUP SMPERIOD10976 D< 0= IF
+    SMPERIOD10976 D- 2SWAP 1. D+ 2SWAP
+  THEN
+  SMSTATEFRAC10976 D!
+  SMOFFINT S>D D+ SMSTATEINT D!
 ;
 
-: FSTYCYCLES ( year --- ) ( Start the fastmoon cycle counter for the year. )
-  FMOFFINT 0 FMSTATEINT !
-  FMOFFFRAC10976 FMSTATEFRAC10976 !
-
-  2DUP DECYCLE UDS*  ( Have to dived by period, period is double. )
-
+: FSTYCYCLES ( ddays --- ) ( Start the fastmoon cycle counter for the year. )
+  DECYCLE UDS* DROP FMPERIOD10976 DROP JM/MOD >R >R S>D R> R> ( 32-bit, 64-bit )
+(  DECYCLE S>D UMD* FMPERIOD10976 UD/MOD ( 16-bit )
+  2SWAP FMOFFFRAC10976 S>D D+
+  2DUP FMPERIOD10976 D< 0= IF
+    FMPERIOD10976 D- 2SWAP 1. D+ 2SWAP
+  THEN
+  FMSTATEFRAC10976 D!
+  FMOFFINT S>D D+ FMSTATEINT D!
 ;
 
 : STYCYCLES ( year --- ) ( Start the counters for the year. )
-  DUP WSTYCYCLES
-  DUP SSTYCYCLES
-  DUP FSTYCYCLES
+  WSTYCYCLES 
+  DAYCOUNT D@ 2DUP SSTYCYCLES FSTYCYCLES
 ;
 
 : STMCYCLES ( year month --- ) ( The year is started, start the month. )