Re: Batch mode option + customized option

[Marcus G. Daniels]

>>>>> "AO" == Akiko Ogawa <- RS/GIS lab <address@hidden>> writes:

AO> I've put coyote.tar.gz on the ftp site.

The main thing here are some syntax changes.  There's a specific
syntax for doubles: the "D0" suffix"

diff -c -r coyote/batch.scm coyote-new/batch.scm
*** coyote/batch.scm    Wed May 24 16:23:38 2000
--- coyote-new/batch.scm        Wed May 24 21:40:44 2000
***************
*** 9,32 ****
        #:maxAge 15
        #:numPack 100
        #:initMember 4
!       #:mortality 0.005
!       #:litterSize 3.27
!       #:litterVariance 2.0
        #:selectRMVL 0
        #:statusForRMVL 1
!       #:selectRMVLprob 0.3
        #:randomRMVL 0
!       #:randomRMVLprob 0.3
        #:denRMVL 0
!       #:denRMVLprob 0.1
        #:reprodCTRL 0
!       #:reprodCTRLprob 0.3
!       #:sterilizationProb 0
        #:packCTRL 0
        #:selectKill 0
        #:randomKill 0
        #:denKill 0
!       #:reprodKill 0)))
!  
  
  
--- 9,32 ----
        #:maxAge 15
        #:numPack 100
        #:initMember 4
!       #:mortality 0.005D0
!       #:litterSize 3.27D0
!       #:litterVariance 2.0D0
        #:selectRMVL 0
        #:statusForRMVL 1
!       #:selectRMVLprob 0.3D0
        #:randomRMVL 0
!       #:randomRMVLprob 0.3D0
        #:denRMVL 0
!       #:denRMVLprob 0.1D0
        #:reprodCTRL 0
!       #:reprodCTRLprob 0.3D0
!       #:sterilizationProb 0.0D0
        #:packCTRL 0
        #:selectKill 0
        #:randomKill 0
        #:denKill 0
!       #:reprodKill 0
!       )))
  
  
Here are some other changes for 2.1.1:

diff -c -r coyote/Coyote.m coyote-new/Coyote.m
*** coyote/Coyote.m     Thu May 11 21:02:28 2000
--- coyote-new/Coyote.m Wed May 24 21:18:30 2000
***************
*** 87,93 ****
  }
  - identifySelf {
  
!   printf("   - %u status: %d, sex: %d, age: %d, sexual: %d, den = %d, state: 
%d\n", 
         self,status,sex,age,sexual,inTheDen,state);
    return self;
  }
--- 87,93 ----
  }
  - identifySelf {
  
!   printf("   - %p status: %d, sex: %d, age: %d, sexual: %d, den = %d, state: 
%d\n", 
         self,status,sex,age,sexual,inTheDen,state);
    return self;
  }
diff -c -r coyote/CoyoteBatchSwarm.m coyote-new/CoyoteBatchSwarm.m
*** coyote/CoyoteBatchSwarm.m   Wed May 24 16:57:04 2000
--- coyote-new/CoyoteBatchSwarm.m       Wed May 24 21:36:10 2000
***************
*** 37,43 ****
  
    // if we can't find the right key from the Archiver, raise an event
    if ((coyoteModelSwarm = 
!        [archiver getWithZone: self object: "modelSwarm"]) == nil)
      raiseEvent(InvalidOperation, 
                 "Can't find archiver file or appropriate key");
    printf(" B3-");
--- 37,43 ----
  
    // if we can't find the right key from the Archiver, raise an event
    if ((coyoteModelSwarm = 
!        [archiver getWithZone: self key: "modelSwarm"]) == nil)
      raiseEvent(InvalidOperation, 
                 "Can't find archiver file or appropriate key");
    printf(" B3-");
diff -c -r coyote/Pack.m coyote-new/Pack.m
*** coyote/Pack.m       Thu May 11 21:07:48 2000
--- coyote-new/Pack.m   Wed May 24 21:19:50 2000
***************
*** 349,355 ****
  - setRandSeed: (int) seed {
  
    randGen = [PMMLCG1gen create: globalZone setStateFromSeed: seed];
!   myNormal = [NormalDistribution create: globalZone setGenerator: randGen];
  
    return self;
  }
--- 349,355 ----
  - setRandSeed: (int) seed {
  
    randGen = [PMMLCG1gen create: globalZone setStateFromSeed: seed];
!   myNormal = [NormalDist create: globalZone setGenerator: randGen];
  
    return self;
  }
diff -c -r coyote/main.m coyote-new/main.m
*** coyote/main.m       Wed May 24 18:09:42 2000
--- coyote-new/main.m   Wed May 24 21:20:08 2000
***************
*** 53,59 ****
        id archiver = [LispArchiver create: globalZone setPath: "batch.scm"];
  
        if ((topLevelSwarm = 
!            [archiver getWithZone: globalZone object: "batchSwarm"]) == nil)
          raiseEvent(InvalidOperation, 
                     "Can't find archiver file or appropriate key");
        
--- 53,59 ----
        id archiver = [LispArchiver create: globalZone setPath: "batch.scm"];
  
        if ((topLevelSwarm = 
!            [archiver getWithZone: globalZone key: "batchSwarm"]) == nil)
          raiseEvent(InvalidOperation, 
                     "Can't find archiver file or appropriate key");
        

Finally, a couple logic changes for non-GUI mode.  Maybe you want
to fix this differently..

diff -c -r coyote/CoyoteBatchSwarm.m coyote-new/CoyoteBatchSwarm.m
*** coyote/CoyoteBatchSwarm.m   Wed May 24 16:57:04 2000
--- coyote-new/CoyoteBatchSwarm.m       Wed May 24 21:36:10 2000
***************
*** 50,56 ****
    [coyoteModelSwarm buildObjects];
    printf("B5-");
  
!   if (reportFrequency)
      {
        popGraph = [EZGraph createBegin: [self getZone]];
        SET_WINDOW_GEOMETRY_RECORD_NAME (popGraph);
--- 50,56 ----
    [coyoteModelSwarm buildObjects];
    printf("B5-");
  
!   if (reportFrequency && swarmGUIMode)
      {
        popGraph = [EZGraph createBegin: [self getZone]];
        SET_WINDOW_GEOMETRY_RECORD_NAME (popGraph);
***************
*** 84,91 ****
    if (reportFrequency)
      {
        displayActions = [ActionGroup create: [self getZone]];
!       
!       [displayActions createActionTo: popGraph message: M(step)];
        [displayActions createActionTo: self         message: M(checkToStop)];
        
        displaySchedule = [Schedule createBegin: [self getZone]];
--- 84,92 ----
    if (reportFrequency)
      {
        displayActions = [ActionGroup create: [self getZone]];
!    
!       if (popGraph)
!       [displayActions createActionTo: popGraph message: M(step)];
        [displayActions createActionTo: self         message: M(checkToStop)];
        
        displaySchedule = [Schedule createBegin: [self getZone]];

                  ==================================
   Swarm-Support is for discussion of the technical details of the day
   to day usage of Swarm.  For list administration needs (esp.
   [un]subscribing), please send a message to <address@hidden>
   with "help" in the body of the message.