swarm-support
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: address@hidden (Marcus G. Daniels)] Re: Error


From: David Sumpter
Subject: Re: address@hidden (Marcus G. Daniels)] Re: Error
Date: Tue, 12 Feb 2002 16:53:55 +0000 (GMT)

Dear Marcus,

Sorry about the long delay in getting back to you. I have not been working
on this over the new year. Thanks for your help.

I still can't get the program to work with Swarm 2.1.1 even with your
changes in place. Is there any way around this, or do I have to install
Swarm 2.2? Unfortunately, I have now moved to Linux and can't just install
the PC binary as you suggested.

Thanks,

David.

On 5 Dec 2001, Marcus G. Daniels wrote:

> >>>>> "DS" == David Sumpter <address@hidden> writes:
>
> DS> Here is the code.
>   [http://www.maths.ox.ac.uk/~sumpter/Emigrate.v18/
>    http://www.maths.ox.ac.uk/~sumpter/socialinsect]
>
> Below are patches to make it work with the latest Swarm.  They should
> be backward compatible with Swarm 2.1.1.  The bug you had a problem
> with has been fixed since 2.1.1.  A beta version is here:
>
>   ftp://ftp.swarm.org/pub/swarm/binaries/w32/latest/Swarm-2.2-pretest-2.tar.gz
>
> To install it, it is necessary to uninstall Swarm 2.1.1 and install Cygwin
> 1.3.5 from www.cygwin.com.  Then untar the URL above somewhere and do
> a "mount x:\the-place-you-unpacked-the-url-above /Swarm-2.2".  You can
> use the Cygwin terminal instead of Start/Programs/Swarm/terminal.
> You'll need to set SWARMHOME and a PATH to /Swarm-2.2/bin.
>
> I don't understand what you're trying to do to the input arguments.  As
> far as I can tell that can just be disabled (see #if 1).  Also, there
> are two invalid method calls in a printf, one to getItem, and one to getCount.
> They don't seem to exist anywhere.
>
> diff -w -c -r Emigrate.v18/Ant.m Emigrate.v18-mgd/Ant.m
> *** Emigrate.v18/Ant.m        Wed Dec  5 11:17:44 2001
> --- Emigrate.v18-mgd/Ant.m    Wed Dec  5 10:35:37 2001
> ***************
> *** 584,586 ****
> --- 584,587 ----
>   }
>
>   @end
> +
> diff -w -c -r Emigrate.v18/EmBatchSwarm.h Emigrate.v18-mgd/EmBatchSwarm.h
> *** Emigrate.v18/EmBatchSwarm.h       Wed Dec  5 11:17:44 2001
> --- Emigrate.v18-mgd/EmBatchSwarm.h   Wed Dec  5 10:47:22 2001
> ***************
> *** 14,21 ****
>   @interface EmBatchSwarm : Swarm {
>
>     // Details for output and input files.
> !   char* fileExt;
> !   char* dirExt;
>
>     FILE * indFile[50];
>
> --- 14,21 ----
>   @interface EmBatchSwarm : Swarm {
>
>     // Details for output and input files.
> !   const char* fileExt;
> !   const char* dirExt;
>
>     FILE * indFile[50];
>
> ***************
> *** 61,67 ****
>
>   +createBegin: (id) aZone;
>
> ! -setFileName: (char*) theFile Dir: (char*) theDir;
>
>   -buildObjects;
>   -buildActions;
> --- 61,67 ----
>
>   +createBegin: (id) aZone;
>
> ! -setFileName: (const char*) theFile Dir: (const char*) theDir;
>
>   -buildObjects;
>   -buildActions;
> diff -w -c -r Emigrate.v18/EmBatchSwarm.m Emigrate.v18-mgd/EmBatchSwarm.m
> *** Emigrate.v18/EmBatchSwarm.m       Wed Dec  5 11:17:44 2001
> --- Emigrate.v18-mgd/EmBatchSwarm.m   Wed Dec  5 10:48:43 2001
> ***************
> *** 1,6 ****
>   // em application.
>
> ! #import "emBatchSwarm.h"
>
>   static unsigned numJobs = 28;
>
> --- 1,6 ----
>   // em application.
>
> ! #import "EmBatchSwarm.h"
>
>   static unsigned numJobs = 28;
>
> ***************
> *** 20,29 ****
>     return obj;
>   }
>
> ! -setFileName: (char*) theFile Dir: (char*) theDir {
>     fileExt = theFile;
>     dirExt = theDir;
> !   if (dirExt!=NULL) dirExt = strcat(dirExt,"/");
>     if (fileExt==NULL) fileExt = "noname";
>    return self;
>   }
> --- 20,29 ----
>     return obj;
>   }
>
> ! -setFileName: (const char*) theFile Dir: (const char*) theDir {
>     fileExt = theFile;
>     dirExt = theDir;
> !   if (dirExt!=NULL) dirExt = (const char *) strcat((char *) dirExt,"/");
>     if (fileExt==NULL) fileExt = "noname";
>    return self;
>   }
> diff -w -c -r Emigrate.v18/EmObserverSwarm.m 
> Emigrate.v18-mgd/EmObserverSwarm.m
> *** Emigrate.v18/EmObserverSwarm.m    Wed Dec  5 11:17:44 2001
> --- Emigrate.v18-mgd/EmObserverSwarm.m        Wed Dec  5 11:07:06 2001
> ***************
> *** 109,115 ****
>
>     // Different items
>     brood0Element = [item0Graph createElement];
> !   [[[brood0Element setLabel: "Brood"] setColor: "cyan"] setWidth: 1];
>     brood0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [brood0Grapher setElement: brood0Element];
>     [brood0Grapher setDataFeed: self];
> --- 109,117 ----
>
>     // Different items
>     brood0Element = [item0Graph createElement];
> !   [brood0Element setLabel: "Brood"];
> !   [brood0Element setColor: "cyan"];
> !   [brood0Element setWidth: 1];
>     brood0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [brood0Grapher setElement: brood0Element];
>     [brood0Grapher setDataFeed: self];
> ***************
> *** 117,123 ****
>     brood0Grapher = [brood0Grapher  createEnd];
>
>     worker0Element = [item0Graph createElement];
> !   [[[worker0Element setLabel: "Workers"] setColor: "blue"] setWidth: 1];
>     worker0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [worker0Grapher setElement: worker0Element];
>     [worker0Grapher setDataFeed: self];
> --- 119,127 ----
>     brood0Grapher = [brood0Grapher  createEnd];
>
>     worker0Element = [item0Graph createElement];
> !   [worker0Element setLabel: "Workers"];
> !   [worker0Element setColor: "blue"];
> !   [worker0Element setWidth: 1];
>     worker0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [worker0Grapher setElement: worker0Element];
>     [worker0Grapher setDataFeed: self];
> ***************
> *** 125,131 ****
>     worker0Grapher = [worker0Grapher  createEnd];
>
>     queen0Element = [item0Graph createElement];
> !   [[[queen0Element setLabel: "Queens"] setColor: "purple"] setWidth: 1];
>     queen0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [queen0Grapher setElement: queen0Element];
>     [queen0Grapher setDataFeed: self];
> --- 129,137 ----
>     worker0Grapher = [worker0Grapher  createEnd];
>
>     queen0Element = [item0Graph createElement];
> !   [queen0Element setLabel: "Queens"];
> !   [queen0Element setColor: "purple"];
> !   [queen0Element setWidth: 1];
>     queen0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [queen0Grapher setElement: queen0Element];
>     [queen0Grapher setDataFeed: self];
> ***************
> *** 133,139 ****
>     queen0Grapher = [queen0Grapher  createEnd];
>
>     brood1Element = [item1Graph createElement];
> !   [[[brood1Element setLabel: "Brood"] setColor: "cyan"] setWidth: 1];
>     brood1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [brood1Grapher setElement: brood1Element];
>     [brood1Grapher setDataFeed: self];
> --- 139,147 ----
>     queen0Grapher = [queen0Grapher  createEnd];
>
>     brood1Element = [item1Graph createElement];
> !   [brood1Element setLabel: "Brood"];
> !   [brood1Element setColor: "cyan"];
> !   [brood1Element setWidth: 1];
>     brood1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [brood1Grapher setElement: brood1Element];
>     [brood1Grapher setDataFeed: self];
> ***************
> *** 141,147 ****
>     brood1Grapher = [brood1Grapher  createEnd];
>
>     worker1Element = [item1Graph createElement];
> !   [[[worker1Element setLabel: "Workers"] setColor: "blue"] setWidth: 1];
>     worker1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [worker1Grapher setElement: worker1Element];
>     [worker1Grapher setDataFeed: self];
> --- 149,157 ----
>     brood1Grapher = [brood1Grapher  createEnd];
>
>     worker1Element = [item1Graph createElement];
> !   [worker1Element setLabel: "Workers"];
> !   [worker1Element setColor: "blue"];
> !   [worker1Element setWidth: 1];
>     worker1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [worker1Grapher setElement: worker1Element];
>     [worker1Grapher setDataFeed: self];
> ***************
> *** 149,155 ****
>     worker1Grapher = [worker1Grapher  createEnd];
>
>     queen1Element = [item1Graph createElement];
> !   [[[queen1Element setLabel: "Queens"] setColor: "purple"] setWidth: 1];
>     queen1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [queen1Grapher setElement: queen1Element];
>     [queen1Grapher setDataFeed: self];
> --- 159,167 ----
>     worker1Grapher = [worker1Grapher  createEnd];
>
>     queen1Element = [item1Graph createElement];
> !   [queen1Element setLabel: "Queens"];
> !   [queen1Element setColor: "purple"];
> !   [queen1Element setWidth: 1];
>     queen1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [queen1Grapher setElement: queen1Element];
>     [queen1Grapher setDataFeed: self];
> ***************
> *** 157,163 ****
>     queen1Grapher = [queen1Grapher  createEnd];
>
>     brood2Element = [item2Graph createElement];
> !   [[[brood2Element setLabel: "Brood"] setColor: "cyan"] setWidth: 1];
>     brood2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [brood2Grapher setElement: brood2Element];
>     [brood2Grapher setDataFeed: self];
> --- 169,177 ----
>     queen1Grapher = [queen1Grapher  createEnd];
>
>     brood2Element = [item2Graph createElement];
> !   [brood2Element setLabel: "Brood"];
> !   [brood2Element setColor: "cyan"];
> !   [brood2Element setWidth: 1];
>     brood2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [brood2Grapher setElement: brood2Element];
>     [brood2Grapher setDataFeed: self];
> ***************
> *** 165,171 ****
>     brood2Grapher = [brood2Grapher  createEnd];
>
>     worker2Element = [item2Graph createElement];
> !   [[[worker2Element setLabel: "Workers"] setColor: "blue"] setWidth: 1];
>     worker2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [worker2Grapher setElement: worker2Element];
>     [worker2Grapher setDataFeed: self];
> --- 179,187 ----
>     brood2Grapher = [brood2Grapher  createEnd];
>
>     worker2Element = [item2Graph createElement];
> !   [worker2Element setLabel: "Workers"];
> !   [worker2Element setColor: "blue"];
> !   [worker2Element setWidth: 1];
>     worker2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [worker2Grapher setElement: worker2Element];
>     [worker2Grapher setDataFeed: self];
> ***************
> *** 173,179 ****
>     worker2Grapher = [worker2Grapher  createEnd];
>
>     queen2Element = [item2Graph createElement];
> !   [[[queen2Element setLabel: "Queens"] setColor: "purple"] setWidth: 1];
>     queen2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [queen2Grapher setElement: queen2Element];
>     [queen2Grapher setDataFeed: self];
> --- 189,197 ----
>     worker2Grapher = [worker2Grapher  createEnd];
>
>     queen2Element = [item2Graph createElement];
> !   [queen2Element setLabel: "Queens"];
> !   [queen2Element setColor: "purple"];
> !   [queen2Element setWidth: 1];
>     queen2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [queen2Grapher setElement: queen2Element];
>     [queen2Grapher setDataFeed: self];
> ***************
> *** 182,188 ****
>
>     // Different jobs
>     atsite0Element = [site0Graph createElement];
> !   [[[atsite0Element setLabel: "At site 0"] setColor: "black"] setWidth: 1];
>     atsite0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [atsite0Grapher setElement: atsite0Element];
>     [atsite0Grapher setDataFeed: self];
> --- 200,208 ----
>
>     // Different jobs
>     atsite0Element = [site0Graph createElement];
> !   [atsite0Element setLabel: "At site 0"];
> !   [atsite0Element setColor: "black"];
> !   [atsite0Element setWidth: 1];
>     atsite0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [atsite0Grapher setElement: atsite0Element];
>     [atsite0Grapher setDataFeed: self];
> ***************
> *** 190,196 ****
>     atsite0Grapher = [atsite0Grapher  createEnd];
>
>     assess0Element = [site0Graph createElement];
> !   [[[assess0Element setLabel: "Assess"] setColor: "cyan"] setWidth: 1];
>     assess0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [assess0Grapher setElement: assess0Element];
>     [assess0Grapher setDataFeed: self];
> --- 210,218 ----
>     atsite0Grapher = [atsite0Grapher  createEnd];
>
>     assess0Element = [site0Graph createElement];
> !   [assess0Element setLabel: "Assess"];
> !   [assess0Element setColor: "cyan"];
> !   [assess0Element setWidth: 1];
>     assess0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [assess0Grapher setElement: assess0Element];
>     [assess0Grapher setDataFeed: self];
> ***************
> *** 198,204 ****
>     assess0Grapher = [assess0Grapher  createEnd];
>
>     tandem0Element = [site0Graph createElement];
> !   [[[tandem0Element setLabel: "Tandem"] setColor: "blue"] setWidth: 1];
>     tandem0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [tandem0Grapher setElement: tandem0Element];
>     [tandem0Grapher setDataFeed: self];
> --- 220,228 ----
>     assess0Grapher = [assess0Grapher  createEnd];
>
>     tandem0Element = [site0Graph createElement];
> !   [tandem0Element setLabel: "Tandem"];
> !   [tandem0Element setColor: "blue"];
> !   [tandem0Element setWidth: 1];
>     tandem0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [tandem0Grapher setElement: tandem0Element];
>     [tandem0Grapher setDataFeed: self];
> ***************
> *** 206,212 ****
>     tandem0Grapher = [tandem0Grapher createEnd];
>
>     transport0Element = [site0Graph createElement];
> !   [[[transport0Element setLabel: "Transport"] setColor: "red"] setWidth: 1];
>     transport0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [transport0Grapher setElement: transport0Element];
>     [transport0Grapher setDataFeed: self];
> --- 230,238 ----
>     tandem0Grapher = [tandem0Grapher createEnd];
>
>     transport0Element = [site0Graph createElement];
> !   [transport0Element setLabel: "Transport"];
> !   [transport0Element setColor: "red"];
> !   [transport0Element setWidth: 1];
>     transport0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [transport0Grapher setElement: transport0Element];
>     [transport0Grapher setDataFeed: self];
> ***************
> *** 214,220 ****
>     transport0Grapher = [transport0Grapher createEnd];
>
>     follow0Element = [site0Graph createElement];
> !   [[[follow0Element setLabel: "Follow"] setColor: "orange"] setWidth: 1];
>     follow0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [follow0Grapher setElement: follow0Element];
>     [follow0Grapher setDataFeed: self];
> --- 240,248 ----
>     transport0Grapher = [transport0Grapher createEnd];
>
>     follow0Element = [site0Graph createElement];
> !   [follow0Element setLabel: "Follow"];
> !   [follow0Element setColor: "orange"];
> !   [follow0Element setWidth: 1];
>     follow0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [follow0Grapher setElement: follow0Element];
>     [follow0Grapher setDataFeed: self];
> ***************
> *** 222,228 ****
>     follow0Grapher = [follow0Grapher createEnd];
>
>     search0Element = [site0Graph createElement];
> !   [[[search0Element setLabel: "Search"] setColor: "green"] setWidth: 1];
>     search0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [search0Grapher setElement: search0Element];
>     [search0Grapher setDataFeed: self];
> --- 250,258 ----
>     follow0Grapher = [follow0Grapher createEnd];
>
>     search0Element = [site0Graph createElement];
> !   [search0Element setLabel: "Search"];
> !   [search0Element setColor: "green"];
> !   [search0Element setWidth: 1];
>     search0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [search0Grapher setElement: search0Element];
>     [search0Grapher setDataFeed: self];
> ***************
> *** 230,236 ****
>     search0Grapher = [search0Grapher createEnd];
>
>     sleep0Element = [site0Graph createElement];
> !   [[[sleep0Element setLabel: "Other"] setColor: "purple"] setWidth: 1];
>     sleep0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [sleep0Grapher setElement: sleep0Element];
>     [sleep0Grapher setDataFeed: self];
> --- 260,268 ----
>     search0Grapher = [search0Grapher createEnd];
>
>     sleep0Element = [site0Graph createElement];
> !   [sleep0Element setLabel: "Other"];
> !   [sleep0Element setColor: "purple"];
> !   [sleep0Element setWidth: 1];
>     sleep0Grapher = [ActiveGraph createBegin: [self getZone]];
>     [sleep0Grapher setElement: sleep0Element];
>     [sleep0Grapher setDataFeed: self];
> ***************
> *** 240,246 ****
>
>     // Different jobs
>     assess1Element = [site1Graph createElement];
> !   [[[assess1Element setLabel: "Assess"] setColor: "cyan"] setWidth: 1];
>     assess1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [assess1Grapher setElement: assess1Element];
>     [assess1Grapher setDataFeed: self];
> --- 272,280 ----
>
>     // Different jobs
>     assess1Element = [site1Graph createElement];
> !   [assess1Element setLabel: "Assess"];
> !   [assess1Element setColor: "cyan"];
> !   [assess1Element setWidth: 1];
>     assess1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [assess1Grapher setElement: assess1Element];
>     [assess1Grapher setDataFeed: self];
> ***************
> *** 248,254 ****
>     assess1Grapher = [assess1Grapher  createEnd];
>
>     atsite1Element = [site1Graph createElement];
> !   [[[atsite1Element setLabel: "At site"] setColor: "black"] setWidth: 1];
>     atsite1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [atsite1Grapher setElement: atsite1Element];
>     [atsite1Grapher setDataFeed: self];
> --- 282,290 ----
>     assess1Grapher = [assess1Grapher  createEnd];
>
>     atsite1Element = [site1Graph createElement];
> !   [atsite1Element setLabel: "At site"];
> !   [atsite1Element setColor: "black"];
> !   [atsite1Element setWidth: 1];
>     atsite1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [atsite1Grapher setElement: atsite1Element];
>     [atsite1Grapher setDataFeed: self];
> ***************
> *** 256,262 ****
>     atsite1Grapher = [atsite1Grapher createEnd];
>
>     tandem1Element = [site1Graph createElement];
> !   [[[tandem1Element setLabel: "Tandem to"] setColor: "blue"] setWidth: 1];
>     tandem1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [tandem1Grapher setElement: tandem1Element];
>     [tandem1Grapher setDataFeed: self];
> --- 292,300 ----
>     atsite1Grapher = [atsite1Grapher createEnd];
>
>     tandem1Element = [site1Graph createElement];
> !   [tandem1Element setLabel: "Tandem to"];
> !   [tandem1Element setColor: "blue"];
> !   [tandem1Element setWidth: 1];
>     tandem1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [tandem1Grapher setElement: tandem1Element];
>     [tandem1Grapher setDataFeed: self];
> ***************
> *** 264,270 ****
>     tandem1Grapher = [tandem1Grapher createEnd];
>
>     transport1Element = [site1Graph createElement];
> !   [[[transport1Element setLabel: "Transport to"] setColor: "red"] setWidth: 
> 1];
>     transport1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [transport1Grapher setElement: transport1Element];
>     [transport1Grapher setDataFeed: self];
> --- 302,310 ----
>     tandem1Grapher = [tandem1Grapher createEnd];
>
>     transport1Element = [site1Graph createElement];
> !   [transport1Element setLabel: "Transport to"];
> !   [transport1Element setColor: "red"];
> !   [transport1Element setWidth: 1];
>     transport1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [transport1Grapher setElement: transport1Element];
>     [transport1Grapher setDataFeed: self];
> ***************
> *** 272,278 ****
>     transport1Grapher = [transport1Grapher createEnd];
>
>     follow1Element = [site1Graph createElement];
> !   [[[follow1Element setLabel: "Follow from"] setColor: "orange"] setWidth: 
> 1];
>     follow1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [follow1Grapher setElement: follow1Element];
>     [follow1Grapher setDataFeed: self];
> --- 312,320 ----
>     transport1Grapher = [transport1Grapher createEnd];
>
>     follow1Element = [site1Graph createElement];
> !   [follow1Element setLabel: "Follow from"];
> !   [follow1Element setColor: "orange"];
> !   [follow1Element setWidth: 1];
>     follow1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [follow1Grapher setElement: follow1Element];
>     [follow1Grapher setDataFeed: self];
> ***************
> *** 280,286 ****
>     follow1Grapher = [follow1Grapher createEnd];
>
>     search1Element = [site1Graph createElement];
> !   [[[search1Element setLabel: "Search from"] setColor: "green"] setWidth: 
> 1];
>     search1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [search1Grapher setElement: search1Element];
>     [search1Grapher setDataFeed: self];
> --- 322,330 ----
>     follow1Grapher = [follow1Grapher createEnd];
>
>     search1Element = [site1Graph createElement];
> !   [search1Element setLabel: "Search from"];
> !   [search1Element setColor: "green"];
> !   [search1Element setWidth: 1];
>     search1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [search1Grapher setElement: search1Element];
>     [search1Grapher setDataFeed: self];
> ***************
> *** 288,294 ****
>     search1Grapher = [search1Grapher createEnd];
>
>     sleep1Element = [site1Graph createElement];
> !   [[[sleep1Element setLabel: "Other"] setColor: "purple"] setWidth: 1];
>     sleep1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [sleep1Grapher setElement: sleep1Element];
>     [sleep1Grapher setDataFeed: self];
> --- 332,340 ----
>     search1Grapher = [search1Grapher createEnd];
>
>     sleep1Element = [site1Graph createElement];
> !   [sleep1Element setLabel: "Other"];
> !   [sleep1Element setColor: "purple"];
> !   [sleep1Element setWidth: 1];
>     sleep1Grapher = [ActiveGraph createBegin: [self getZone]];
>     [sleep1Grapher setElement: sleep1Element];
>     [sleep1Grapher setDataFeed: self];
> ***************
> *** 298,304 ****
>
>     // Different jobs
>     assess2Element = [site2Graph createElement];
> !   [[[assess2Element setLabel: "Assess"] setColor: "cyan"] setWidth: 1];
>     assess2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [assess2Grapher setElement: assess2Element];
>     [assess2Grapher setDataFeed: self];
> --- 344,352 ----
>
>     // Different jobs
>     assess2Element = [site2Graph createElement];
> !   [assess2Element setLabel: "Assess"];
> !   [assess2Element setColor: "cyan"];
> !   [assess2Element setWidth: 1];
>     assess2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [assess2Grapher setElement: assess2Element];
>     [assess2Grapher setDataFeed: self];
> ***************
> *** 306,312 ****
>     assess2Grapher = [assess2Grapher  createEnd];
>
>     atsite2Element = [site2Graph createElement];
> !   [[[atsite2Element setLabel: "At site"] setColor: "black"] setWidth: 1];
>     atsite2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [atsite2Grapher setElement: atsite2Element];
>     [atsite2Grapher setDataFeed: self];
> --- 354,362 ----
>     assess2Grapher = [assess2Grapher  createEnd];
>
>     atsite2Element = [site2Graph createElement];
> !   [atsite2Element setLabel: "At site"];
> !   [atsite2Element setColor: "black"];
> !   [atsite2Element setWidth: 1];
>     atsite2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [atsite2Grapher setElement: atsite2Element];
>     [atsite2Grapher setDataFeed: self];
> ***************
> *** 314,320 ****
>     atsite2Grapher = [atsite2Grapher createEnd];
>
>     tandem2Element = [site2Graph createElement];
> !   [[[tandem2Element setLabel: "Tandem to"] setColor: "blue"] setWidth: 1];
>     tandem2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [tandem2Grapher setElement: tandem2Element];
>     [tandem2Grapher setDataFeed: self];
> --- 364,372 ----
>     atsite2Grapher = [atsite2Grapher createEnd];
>
>     tandem2Element = [site2Graph createElement];
> !   [tandem2Element setLabel: "Tandem to"];
> !   [tandem2Element setColor: "blue"];
> !   [tandem2Element setWidth: 1];
>     tandem2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [tandem2Grapher setElement: tandem2Element];
>     [tandem2Grapher setDataFeed: self];
> ***************
> *** 322,328 ****
>     tandem2Grapher = [tandem2Grapher createEnd];
>
>     transport2Element = [site2Graph createElement];
> !   [[[transport2Element setLabel: "Transport to"] setColor: "red"] setWidth: 
> 1];
>     transport2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [transport2Grapher setElement: transport2Element];
>     [transport2Grapher setDataFeed: self];
> --- 374,382 ----
>     tandem2Grapher = [tandem2Grapher createEnd];
>
>     transport2Element = [site2Graph createElement];
> !   [transport2Element setLabel: "Transport to"];
> !   [transport2Element setColor: "red"];
> !   [transport2Element setWidth: 1];
>     transport2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [transport2Grapher setElement: transport2Element];
>     [transport2Grapher setDataFeed: self];
> ***************
> *** 330,336 ****
>     transport2Grapher = [transport2Grapher createEnd];
>
>     follow2Element = [site2Graph createElement];
> !   [[[follow2Element setLabel: "Follow from"] setColor: "orange"] setWidth: 
> 1];
>     follow2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [follow2Grapher setElement: follow2Element];
>     [follow2Grapher setDataFeed: self];
> --- 384,392 ----
>     transport2Grapher = [transport2Grapher createEnd];
>
>     follow2Element = [site2Graph createElement];
> !   [follow2Element setLabel: "Follow from"];
> !   [follow2Element setColor: "orange"];
> !   [follow2Element setWidth: 1];
>     follow2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [follow2Grapher setElement: follow2Element];
>     [follow2Grapher setDataFeed: self];
> ***************
> *** 338,344 ****
>     follow2Grapher = [follow2Grapher createEnd];
>
>     search2Element = [site2Graph createElement];
> !   [[[search2Element setLabel: "Search from"] setColor: "green"] setWidth: 
> 1];
>     search2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [search2Grapher setElement: search2Element];
>     [search2Grapher setDataFeed: self];
> --- 394,402 ----
>     follow2Grapher = [follow2Grapher createEnd];
>
>     search2Element = [site2Graph createElement];
> !   [search2Element setLabel: "Search from"];
> !   [search2Element setColor: "green"];
> !   [search2Element setWidth: 1];
>     search2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [search2Grapher setElement: search2Element];
>     [search2Grapher setDataFeed: self];
> ***************
> *** 346,352 ****
>     search2Grapher = [search2Grapher createEnd];
>
>     sleep2Element = [site2Graph createElement];
> !   [[[sleep2Element setLabel: "Other"] setColor: "purple"] setWidth: 1];
>     sleep2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [sleep2Grapher setElement: sleep2Element];
>     [sleep2Grapher setDataFeed: self];
> --- 404,412 ----
>     search2Grapher = [search2Grapher createEnd];
>
>     sleep2Element = [site2Graph createElement];
> !   [sleep2Element setLabel: "Other"];
> !   [sleep2Element setColor: "purple"];
> !   [sleep2Element setWidth: 1];
>     sleep2Grapher = [ActiveGraph createBegin: [self getZone]];
>     [sleep2Grapher setElement: sleep2Element];
>     [sleep2Grapher setDataFeed: self];
> ***************
> *** 438,444 ****
>               job = [aWorker getJob];
>               site = [aWorker getCurrent];
>       if (job % 2 == 1) {
> !     fprintf(indFile[[aWorker 
> getID]],"%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\n", timeStep,[aWorker getID], 
> job, site, [aWorker getFormer], [aWorker getItem], [aWorker getTravelTime], 
> [aWorker getTimeTravelling], [aWorker getNewNest], [aWorker getLeader], 
> [aWorker getCount], [aWorker getTandemThreshold]);
>       }
>
>               jobs[job][site]++;
> --- 498,504 ----
>               job = [aWorker getJob];
>               site = [aWorker getCurrent];
>       if (job % 2 == 1) {
> !     fprintf(indFile[[aWorker getID]],"%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\n", 
> timeStep,[aWorker getID], job, site, [aWorker getFormer], [aWorker 
> getTravelTime], [aWorker getTimeTravelling], [aWorker getNewNest], [aWorker 
> getLeader], [aWorker getTandemThreshold]);
>       }
>
>               jobs[job][site]++;
> diff -w -c -r Emigrate.v18/Makefile Emigrate.v18-mgd/Makefile
> *** Emigrate.v18/Makefile     Wed Dec  5 11:17:45 2001
> --- Emigrate.v18-mgd/Makefile Wed Dec  5 10:54:14 2001
> ***************
> *** 6,17 ****
>   # you should also write dependencies for each of your .o files to ensure
>   #   correct compilation.
>
> ! SWARMHOME=C:/Swarm-2.1.1/etc/swarm
>   APPLICATION=emigrate
>   OBJECTS=main.o Random.o Ant.o EmEnvironment.o EmModelSwarm.o 
> EmObserverSwarm.o EmBatchSwarm.o
>   APPLIBS= ../socialinsect/libsocialinsect.a
>
> ! include $(SWARMHOME)/Makefile.appl
>
>   main.o: main.m
>
> --- 6,19 ----
>   # you should also write dependencies for each of your .o files to ensure
>   #   correct compilation.
>
> ! #SWARMHOME=C:/Swarm-2.1.1/etc/swarm
>   APPLICATION=emigrate
> + address@hidden
> + APPVERSION=0.0
>   OBJECTS=main.o Random.o Ant.o EmEnvironment.o EmModelSwarm.o 
> EmObserverSwarm.o EmBatchSwarm.o
>   APPLIBS= ../socialinsect/libsocialinsect.a
>
> ! include $(SWARMHOME)/etc/swarm/Makefile.appl
>
>   main.o: main.m
>
> diff -w -c -r Emigrate.v18/main.m Emigrate.v18-mgd/main.m
> *** Emigrate.v18/main.m       Wed Dec  5 11:17:45 2001
> --- Emigrate.v18-mgd/main.m   Wed Dec  5 11:08:23 2001
> ***************
> *** 1,3 ****
> --- 1,4 ----
> + #import <simtools.h>
>   #include "string.h"
>
>   #import "EmObserverSwarm.h"
> ***************
> *** 5,10 ****
> --- 6,12 ----
>
>   int main(int argc, const char ** argv) {
>     id observerSwarm;
> + #if 1
>     const char ** someargv = argv ;
>     int someargc=argc;
>     //int i;
> ***************
> *** 13,18 ****
> --- 15,21 ----
>     if (argc>=2) someargc=2;
>     //printf("%s    \t %s",someargv[0],someargv[1]);
>     //fflush(NULL);
> + #endif
>
>     initSwarm(someargc, someargv);
>
>


                  ==================================
   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.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]