diff -rc ASM-2.2/ChangeLog ASM-2.2.1/ChangeLog
*** ASM-2.2/ChangeLog	Sun Nov 25 20:18:31 2001
--- ASM-2.2.1/ChangeLog	Wed Oct  2 15:30:23 2002
***************
*** 1,3 ****
--- 1,12 ----
+ 2002-10-02  Paul E Johnson  <pauljohn@ukans.edu>
+ 
+ 	* World.m (bitnamelist): Put parens around GETMA macro. Thanks to
+ 	Thomas Badegruber for pointing out the problem and the
+ 	fix.<thomas.badegruber@uni-graz.at>
+ 
+ 	* asm.scm (cons): add D0 to all double valued entries. Windows
+ 	users got crashes without them.
+ 
  2001-11-25    <pauljohn@dv01m45.lawrence.ks.us>
  
  	* ASMModelSwarm.m ([ASMModelSwarm -buildObjects]): No need to set
Only in ASM-2.2.1: ChangeLog.~1.25.~
diff -rc ASM-2.2/World.m ASM-2.2.1/World.m
*** ASM-2.2/World.m	Tue Nov  6 01:29:38 2001
--- ASM-2.2.1/World.m	Wed Oct  2 15:30:23 2002
***************
*** 440,456 ****
  
    /* Dividend moving averages went up or down */
    for (j = 0; j < NMAS; j++)
!     realworld[i++] = GETMA(divMA,j) > GETMA(olddivMA,j);
    
  
    /* Dividend > MA[j] */
    for (j = 0; j < NMAS; j++)
!     realworld[i++] = dividend >  GETMA(divMA,j);
  
    /* Dividend MA[j] > dividend MA[k] */
    for (j = 0; j < NMAS-1; j++)
      for (k = j+1; k < NMAS; k++)
!       realworld[i++] = GETMA(divMA,j) > GETMA(divMA,k);
        //  realworld[i++] = exponentialMAs ? [divMA[j] getEWMA]:[divMA[j] getMA]  > exponentialMAs ? [divMA[k] getEWMA]:[divMA[k] getMA];
        //realworld[i++] = dmav[j] > dmav[k];
  
--- 440,456 ----
  
    /* Dividend moving averages went up or down */
    for (j = 0; j < NMAS; j++)
!     realworld[i++] = (GETMA(divMA,j)) > (GETMA(olddivMA,j));
    
  
    /* Dividend > MA[j] */
    for (j = 0; j < NMAS; j++)
!     realworld[i++] = dividend > ( GETMA(divMA,j));
  
    /* Dividend MA[j] > dividend MA[k] */
    for (j = 0; j < NMAS-1; j++)
      for (k = j+1; k < NMAS; k++)
!       realworld[i++] = (GETMA(divMA,j)) > (GETMA(divMA,k));
        //  realworld[i++] = exponentialMAs ? [divMA[j] getEWMA]:[divMA[j] getMA]  > exponentialMAs ? [divMA[k] getEWMA]:[divMA[k] getMA];
        //realworld[i++] = dmav[j] > dmav[k];
  
***************
*** 472,490 ****
  
    /* Price moving averages went up or down */
    for (j = 0; j < NMAS; j++)
!     realworld[i++] = GETMA(priceMA,j) > GETMA(oldpriceMA,j);
      //realworld[i++] =pmav[j] > oldpmav[j];
  
    /* Price > MA[j] */
    for (j = 0; j < NMAS; j++)
!      realworld[i++] = price > GETMA(priceMA,j);
      //  realworld[i++] = price > exponentialMAs ? [priceMA[j] getEWMA]:[priceMA[j] getMA];
    // realworld[i++] = price > pmav[j];
  
    /* Price MA[j] > price MA[k] */
    for (j = 0; j < NMAS-1; j++)
      for (k = j+1; k < NMAS; k++)
!       realworld[i++] = GETMA(priceMA,j) > GETMA(priceMA,k);
    
    // Check
    if (i != NWORLDBITS)
--- 472,490 ----
  
    /* Price moving averages went up or down */
    for (j = 0; j < NMAS; j++)
!     realworld[i++] = (GETMA(priceMA,j)) > (GETMA(oldpriceMA,j));
      //realworld[i++] =pmav[j] > oldpmav[j];
  
    /* Price > MA[j] */
    for (j = 0; j < NMAS; j++)
!      realworld[i++] = price > (GETMA(priceMA,j));
      //  realworld[i++] = price > exponentialMAs ? [priceMA[j] getEWMA]:[priceMA[j] getMA];
    // realworld[i++] = price > pmav[j];
  
    /* Price MA[j] > price MA[k] */
    for (j = 0; j < NMAS-1; j++)
      for (k = j+1; k < NMAS; k++)
!       realworld[i++] = (GETMA(priceMA,j)) > (GETMA(priceMA,k));
    
    // Check
    if (i != NWORLDBITS)
diff -rc ASM-2.2/asm.scm ASM-2.2.1/asm.scm
*** ASM-2.2/asm.scm	Sat Nov  3 13:55:36 2001
--- ASM-2.2.1/asm.scm	Wed Oct  2 15:30:23 2002
***************
*** 3,13 ****
   (cons 'bfParams
    (make-instance 'BFParams
    #:numfcasts 60
!   #:tauv  50.0
!   #:lambda  0.3 
!   #:maxbid  10.0
    #:mincount  5
!   #:subrange   0.5  
    #:gafrequency   100 
    #:firstgatime   100
    #:longtime   2000
--- 3,13 ----
   (cons 'bfParams
    (make-instance 'BFParams
    #:numfcasts 60
!   #:tauv  50.0D0
!   #:lambda  0.3D0 
!   #:maxbid  10.0D0
    #:mincount  5
!   #:subrange   0.5D0  
    #:gafrequency   100 
    #:firstgatime   100
    #:longtime   2000
***************
*** 51,63 ****
    #:mindividend 0.00005D0
    #:maxdividend 100D0
    #:amplitude 0.14178D0
!   #:period 1.0
    #:maxprice 500D0
    #:minprice 0.001D0
    #:taup 50.0D0
    #:sptype 2
    #:maxiterations 10 
!   #:minexcess 0.01
    #:eta 0.0005D0
    #:etamax 0.05D0
    #:etamin 0.00001D0
--- 51,63 ----
    #:mindividend 0.00005D0
    #:maxdividend 100D0
    #:amplitude 0.14178D0
!   #:period 1.0D0
    #:maxprice 500D0
    #:minprice 0.001D0
    #:taup 50.0D0
    #:sptype 2
    #:maxiterations 10 
!   #:minexcess 0.01D0
    #:eta 0.0005D0
    #:etamax 0.05D0
    #:etamin 0.00001D0