Gave each fish a unique integer ID which is now written to Move_Test_…

…Report.csv, (addresses #28)
colinsheppard · Nov 4, 2011 · 6f78cb7 · 6f78cb7
1 parent 20666fd
commit 6f78cb7
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 31 deletions.
diff --git a/Trout.h b/Trout.h
@@ -33,7 +33,7 @@ Boston, MA 02111-1307, USA.
 #include "DEBUGFLAGS.h"
 #import "globals.h"
 
-//#define MOVE_REPORT_ON
+#define MOVE_REPORT_ON
 //#define READY_TO_SPAWN_RPT
 //#define SPAWN_CELL_RPT
 
@@ -147,6 +147,7 @@ double netEnergyForCell;
 
 char *feedStrategy;
 char *inShelter;
+int fishID;
 
 double maxMoveDistance;
 
@@ -203,6 +204,7 @@ id toggledFishForHabSurvUpdate;
 - setSpawnDepthInterpolator: (id <InterpolationTable>) anInterpolator;
 - setSpawnVelocityInterpolator: (id <InterpolationTable>) anInterpolator;
 - setCaptureLogistic: (LogisticFunc *) aLogisticFunc;
+- setFishID: (int) anIDNum;
 
 
 //- setMovementRule: (char *) aRule;

diff --git a/Trout.m b/Trout.m
@@ -65,6 +65,17 @@ @implementation Trout
   return self;
 }
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// setFishID
+//
+////////////////////////////////////////////////////////////////////////////
+- setFishID: (int) anIDNum 
+{
+  fishID = anIDNum;
+
+  return self;
+}
 
 
 ///////////////////////////////////////////////
@@ -2786,9 +2797,9 @@ - (double) getHourlySearchConRate
        fileMetaData = [BreakoutReporter reportFileMetaData: scratchZone];
        fprintf(mvRptPtr,"\n%s\n\n",fileMetaData);
        [scratchZone free: fileMetaData];
-       fprintf(mvRptPtr,"%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,\n",
+       fprintf(mvRptPtr,"%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,\n",
                                                            "DATE",
-                                                           //"FISH-ID",
+							   "FISH-ID",
 							   "SPECIES",
 							   "AGE",
                                                           "VELOCITY",
@@ -2831,34 +2842,35 @@ - (double) getHourlySearchConRate
       exit(1);
   }
 
-  strcpy(strDataFormat,"%s,%s,%d,%E,%E,%E,%E,%E,%E,%E,%E,%E,%E,%E,%E,%E,%E,%E,%E,%E,%s,%E,%E,%s,%E,%E,%E\n");
+  strcpy(strDataFormat,"%s,%d,%s,%d,%E,%E,%E,%E,%E,%E,%E,%E,%E,%E,%E,%E,%E,%E,%E,%E,%E,%s,%E,%E,%s,%E,%E,%E\n");
   fprintf(mvRptPtr, strDataFormat,[timeManager getDateWithTimeT: [self getCurrentTimeT]],
-						   mySpecies,
-						   age,
-                                                   velocity,
-                                                   depth,
-                                                   temp,
-                                                   turbidity,
-                                                   distToHide,
-                                                   piscivDensity,
-                                                   availableDrift,
-                                                   availableSearch,
-                                                   fishLength,
-                                                   fishWeight,
-                                                   feedTimeForCell,
-                                                   captureSuccess,
-                                                   potentialHourlyDriftIntake,
-                                                   potentialHourlySearchIntake,
-                                                   cMax,
-                                                   standardResp,
-                                                   activeResp,
-                                                   inShelter,
-                                                   dailyDriftNetEnergy,
-                                                   dailySearchNetEnergy,
-                                                   feedStrategy,
-                                                   nonStarvSurvival,
-                                                   netEnergyForBestCell,
-                                                   expectedMaturity);
+                                fishID,
+				mySpecies,
+				age,
+                                velocity,
+                                depth,
+                                temp,
+                                turbidity,
+                                distToHide,
+                                piscivDensity,
+                                availableDrift,
+                                availableSearch,
+                                fishLength,
+                                fishWeight,
+                                feedTimeForCell,
+                                captureSuccess,
+                                potentialHourlyDriftIntake,
+                                potentialHourlySearchIntake,
+                                cMax,
+                                standardResp,
+                                activeResp,
+                                inShelter,
+                                dailyDriftNetEnergy,
+                                dailySearchNetEnergy,
+                                feedStrategy,
+                                nonStarvSurvival,
+                                netEnergyForBestCell,
+                                expectedMaturity);
 
 
   fflush(mvRptPtr);

diff --git a/TroutModelSwarm.h b/TroutModelSwarm.h
@@ -154,8 +154,8 @@ char*        movementRule;
 
   time_t popInitTime;
 
-
   id fishColorMap;
+  int fishCounter;
 
   id <List> speciesSymbolList;  // List of symbols corresp to species studied
 

diff --git a/TroutModelSwarm.m b/TroutModelSwarm.m
@@ -146,6 +146,8 @@ @implementation TroutModelSwarm
 
   reachSymbolList = [List create: modelZone];
 
+  fishCounter = 0;
+
   fprintf(stdout, "TroutModelSwarm >>>> buildObjects >>> instantiateObjects >>>> BEFORE HabitatManager\n");
   fflush(0);
 
@@ -1758,6 +1760,9 @@ - (Trout *) createNewFishWithSpeciesIndex: (int) speciesNdx
   [newFish setSpawnVelocityInterpolator: aSpawnVelocityInterpolator];
   [newFish setCaptureLogistic: aCaptureLogistic];
 
+  fishCounter++;  // Give each fish a serial number ID
+  [newFish setFishID: fishCounter];
+
   newFish = [newFish createEnd];
 
   //fprintf(stdout, "TroutModelSwarm >>>> createNewFishWithSpeciesIndex >>>> END\n");