[Avida-cvs] [Avida2-svn] r333 - in trunk: Avida2.xcodeproj source/main
brysonda@myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Thu Oct 6 16:30:44 PDT 2005
Author: brysonda
Date: 2005-10-06 19:30:43 -0400 (Thu, 06 Oct 2005)
New Revision: 333
Added:
trunk/source/main/nGeometry.h
trunk/source/main/nReaction.h
Removed:
trunk/source/main/reaction_macros.hh
trunk/source/main/resource_count_macros.hh
trunk/source/main/resource_macros.hh
Modified:
trunk/Avida2.xcodeproj/project.pbxproj
trunk/source/main/cConfig.h
trunk/source/main/cEnvironment.cc
trunk/source/main/cLocalMutations.cc
trunk/source/main/cMutationLib.cc
trunk/source/main/cPopulation.cc
trunk/source/main/cReactionProcess.cc
trunk/source/main/cResource.cc
trunk/source/main/cResourceCount.cc
trunk/source/main/cSpatialCountElem.cc
trunk/source/main/cSpatialResCount.cc
trunk/source/main/cStats.cc
trunk/source/main/cStats.h
trunk/source/main/nMutation.h
Log:
Finish renaming main/*macros.hh
Modified: trunk/Avida2.xcodeproj/project.pbxproj
===================================================================
--- trunk/Avida2.xcodeproj/project.pbxproj 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/Avida2.xcodeproj/project.pbxproj 2005-10-06 23:30:43 UTC (rev 333)
@@ -474,6 +474,8 @@
70B0872B08F5E82D00FC65FE /* cStats.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cStats.cc; sourceTree = "<group>"; };
70B0872C08F5E82D00FC65FE /* cTaskEntry.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cTaskEntry.cc; sourceTree = "<group>"; };
70B0872D08F5E82D00FC65FE /* cTaskLib.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cTaskLib.cc; sourceTree = "<group>"; };
+ 70B0875A08F5EC8900FC65FE /* nGeometry.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = nGeometry.h; sourceTree = "<group>"; };
+ 70B0875C08F5ECBC00FC65FE /* nReaction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = nReaction.h; sourceTree = "<group>"; };
70C1EF4608C393BA00F50912 /* cCodeLabel.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cCodeLabel.cc; sourceTree = "<group>"; };
70C1EF4708C393BA00F50912 /* cCodeLabel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cCodeLabel.h; sourceTree = "<group>"; };
70C1EF5808C3948C00F50912 /* cCPUMemory.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cCPUMemory.cc; sourceTree = "<group>"; };
@@ -988,9 +990,6 @@
DCC310F10762539E008F7A48 /* main_sub.pri */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = main_sub.pri; sourceTree = "<group>"; };
DCC311090762539E008F7A48 /* primitive.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = primitive.cc; sourceTree = "<group>"; };
DCC3110A0762539E008F7A48 /* primitive.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = primitive.hh; sourceTree = "<group>"; };
- DCC3110F0762539E008F7A48 /* reaction_macros.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = reaction_macros.hh; sourceTree = "<group>"; };
- DCC3111A0762539E008F7A48 /* resource_count_macros.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = resource_count_macros.hh; sourceTree = "<group>"; };
- DCC3111D0762539E008F7A48 /* resource_macros.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = resource_macros.hh; sourceTree = "<group>"; };
DCC311390762539E008F7A48 /* modules.pri */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = modules.pri; sourceTree = "<group>"; };
DCC3114B0762539E008F7A48 /* analyze.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze.cfg; sourceTree = "<group>"; };
DCC3114C0762539E008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
@@ -2038,6 +2037,8 @@
DCC310040762539D008F7A48 /* main */ = {
isa = PBXGroup;
children = (
+ 70B0875C08F5ECBC00FC65FE /* nReaction.h */,
+ 70B0875A08F5EC8900FC65FE /* nGeometry.h */,
70B0871E08F5E82D00FC65FE /* cReaction.cc */,
70B0871F08F5E82D00FC65FE /* cReactionLib.cc */,
70B0872008F5E82D00FC65FE /* cReactionProcess.cc */,
@@ -2172,9 +2173,6 @@
DCC310F10762539E008F7A48 /* main_sub.pri */,
DCC311090762539E008F7A48 /* primitive.cc */,
DCC3110A0762539E008F7A48 /* primitive.hh */,
- DCC3110F0762539E008F7A48 /* reaction_macros.hh */,
- DCC3111A0762539E008F7A48 /* resource_count_macros.hh */,
- DCC3111D0762539E008F7A48 /* resource_macros.hh */,
DCC3112E0762539E008F7A48 /* unit_testsuites */,
70B085D108F48C9400FC65FE /* nSpecies.h */,
);
Modified: trunk/source/main/cConfig.h
===================================================================
--- trunk/source/main/cConfig.h 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/cConfig.h 2005-10-06 23:30:43 UTC (rev 333)
@@ -17,6 +17,7 @@
#ifndef TLIST_HH
#include "tList.hh"
#endif
+#include "nGeometry.h"
#define SLICE_CONSTANT 0
#define SLICE_PROB_MERIT 1
@@ -58,10 +59,6 @@
#define SIZE_MERIT_LEAST 4
#define SIZE_MERIT_SQRT_LEAST 5
-#define GEOMETRY_GLOBAL 0
-#define GEOMETRY_GRID 1
-#define GEOMETRY_TORUS 2
-
class cString; // aggregate
class cStringList; // aggregate
class cGenesis;
Modified: trunk/source/main/cEnvironment.cc
===================================================================
--- trunk/source/main/cEnvironment.cc 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/cEnvironment.cc 2005-10-06 23:30:43 UTC (rev 333)
@@ -12,7 +12,7 @@
#ifndef INIT_FILE_HH
#include "init_file.hh"
#endif
-#ifndef MUTATION_MACROS_HH
+#ifndef nMutation_h
#include "nMutation.h"
#endif
#ifndef RANDOM_HH
@@ -21,8 +21,8 @@
#ifndef REACTION_HH
#include "cReaction.h"
#endif
-#ifndef REACTION_MACROS_HH
-#include "reaction_macros.hh"
+#ifndef nReaction_h
+#include "nReaction.h"
#endif
#ifndef REACTION_PROCESS_HH
#include "cReactionProcess.h"
@@ -178,9 +178,9 @@
new_process->SetValue(var_value.AsDouble());
}
else if (var_name == "type") {
- if (var_value=="add") new_process->SetType(REACTION_PROCTYPE_ADD);
- else if (var_value=="mult") new_process->SetType(REACTION_PROCTYPE_MULT);
- else if (var_value=="pow") new_process->SetType(REACTION_PROCTYPE_POW);
+ if (var_value=="add") new_process->SetType(nReaction::PROCTYPE_ADD);
+ else if (var_value=="mult") new_process->SetType(nReaction::PROCTYPE_MULT);
+ else if (var_value=="pow") new_process->SetType(nReaction::PROCTYPE_POW);
else {
cerr << "Unknown reaction process type '" << var_value
<< "' found in '" << reaction->GetName() << "'." << endl;
@@ -867,13 +867,13 @@
double bonus = consumed * cur_process->GetValue() * task_quality;
switch (cur_process->GetType()) {
- case REACTION_PROCTYPE_ADD:
+ case nReaction::PROCTYPE_ADD:
result.AddBonus(bonus);
break;
- case REACTION_PROCTYPE_MULT:
+ case nReaction::PROCTYPE_MULT:
result.MultBonus(bonus);
break;
- case REACTION_PROCTYPE_POW:
+ case nReaction::PROCTYPE_POW:
result.MultBonus( pow(2.0, bonus) );
break;
default:
Modified: trunk/source/main/cLocalMutations.cc
===================================================================
--- trunk/source/main/cLocalMutations.cc 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/cLocalMutations.cc 2005-10-06 23:30:43 UTC (rev 333)
@@ -15,7 +15,7 @@
#ifndef MUTATION_LIB_HH
#include "cMutationLib.h"
#endif
-#ifndef MUTATION_MACROS_HH
+#ifndef nMutation_h
#include "nMutation.h"
#endif
Modified: trunk/source/main/cMutationLib.cc
===================================================================
--- trunk/source/main/cMutationLib.cc 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/cMutationLib.cc 2005-10-06 23:30:43 UTC (rev 333)
@@ -12,7 +12,7 @@
#ifndef MUTATION_HH
#include "cMutation.h"
#endif
-#ifndef MUTATION_MACROS_HH
+#ifndef nMutation_h
#include "nMutation.h"
#endif
Modified: trunk/source/main/cPopulation.cc
===================================================================
--- trunk/source/main/cPopulation.cc 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/cPopulation.cc 2005-10-06 23:30:43 UTC (rev 333)
@@ -89,9 +89,9 @@
const int num_cells = world_x * world_y;
cout << "Building world " << world_x << "x" << world_y
<< " = " << num_cells << " organisms." << endl;
- if (geometry == GEOMETRY_GRID) {
+ if (geometry == nGeometry::GRID) {
cout << "Geometry: Bounded grid" << endl;
- } else if (geometry == GEOMETRY_TORUS) {
+ } else if (geometry == nGeometry::TORUS) {
cout << "Geometry: Torus" << endl;
} else {
cout << "Geometry: Unknown" << endl;
@@ -108,22 +108,22 @@
cell_array[cell_id].Setup(cell_id, default_mut_rates);
- if ((y == 0) && (geometry == GEOMETRY_GRID)) {
+ if ((y == 0) && (geometry == nGeometry::GRID)) {
bottom_flag = false;
} else {
bottom_flag = true;
}
- if ((y == world_y-1) && (geometry == GEOMETRY_GRID)) {
+ if ((y == world_y-1) && (geometry == nGeometry::GRID)) {
top_flag = false;
} else {
top_flag = true;
}
- if ((x == 0) && (geometry == GEOMETRY_GRID)) {
+ if ((x == 0) && (geometry == nGeometry::GRID)) {
left_flag = false;
} else {
left_flag = true;
}
- if ((x == world_x-1) && (geometry == GEOMETRY_GRID)) {
+ if ((x == world_x-1) && (geometry == nGeometry::GRID)) {
right_flag = false;
} else {
right_flag = true;
Modified: trunk/source/main/cReactionProcess.cc
===================================================================
--- trunk/source/main/cReactionProcess.cc 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/cReactionProcess.cc 2005-10-06 23:30:43 UTC (rev 333)
@@ -12,8 +12,8 @@
#ifndef DEFS_HH
#include "defs.hh"
#endif
-#ifndef REACTION_MACROS_HH
-#include "reaction_macros.hh"
+#ifndef nReaction_h
+#include "nReaction.h"
#endif
//////////////////////
@@ -23,7 +23,7 @@
cReactionProcess::cReactionProcess()
: resource(NULL)
, value(1.0)
- , type(REACTION_PROCTYPE_ADD)
+ , type(nReaction::PROCTYPE_ADD)
, max_number(1.0)
, min_number(0.0)
, max_fraction(1.0)
Modified: trunk/source/main/cResource.cc
===================================================================
--- trunk/source/main/cResource.cc 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/cResource.cc 2005-10-06 23:30:43 UTC (rev 333)
@@ -21,7 +21,7 @@
, initial(0.0)
, inflow(0.0)
, outflow(0.0)
- , geometry(GEOMETRY_GLOBAL)
+ , geometry(nGeometry::GLOBAL)
, inflowX1(-99)
, inflowX2(-99)
, inflowY1(-99)
@@ -41,13 +41,13 @@
{
_geometry.ToLower();
if (_geometry == "global") {
- geometry = GEOMETRY_GLOBAL;
+ geometry = nGeometry::GLOBAL;
return true;
} else if (_geometry == "grid") {
- geometry = GEOMETRY_GRID;
+ geometry = nGeometry::GRID;
return true;
} else if (_geometry == "torus") {
- geometry = GEOMETRY_TORUS;
+ geometry = nGeometry::TORUS;
return true;
} else {
return false;
Modified: trunk/source/main/cResourceCount.cc
===================================================================
--- trunk/source/main/cResourceCount.cc 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/cResourceCount.cc 2005-10-06 23:30:43 UTC (rev 333)
@@ -134,7 +134,7 @@
inflow_rate.SetAll(0.0);
decay_precalc.SetAll(0.0);
inflow_precalc.SetAll(0.0);
- geometry.SetAll(GEOMETRY_GLOBAL);
+ geometry.SetAll(nGeometry::GLOBAL);
curr_grid_res_cnt.SetAll(0.0);
}
@@ -158,11 +158,11 @@
assert(spatial_resource_count[id].GetSize() > 0);
cString geo_name;
- if (in_geometry == GEOMETRY_GLOBAL) {
+ if (in_geometry == nGeometry::GLOBAL) {
geo_name = "GLOBAL";
- } else if (in_geometry == GEOMETRY_GRID) {
+ } else if (in_geometry == nGeometry::GRID) {
geo_name = "GRID";
- } else if (in_geometry == GEOMETRY_TORUS) {
+ } else if (in_geometry == nGeometry::TORUS) {
geo_name = "TORUS";
}
#if 0
@@ -172,7 +172,7 @@
<< ", decay=" << decay
<< ", inflow=" << inflow
<< endl;
- if ((in_geometry == GEOMETRY_GRID) || (in_geometry == GEOMETRY_TORUS)) {
+ if ((in_geometry == nGeometry::GRID) || (in_geometry == nGeometry::TORUS)) {
cerr << " Inflow rectangle (" << in_inflowX1
<< "," << in_inflowY1
<< ") to (" << in_inflowX2
@@ -247,7 +247,7 @@
DoUpdates();
for (int i = 0; i < num_resources; i++) {
- if (geometry[i] == GEOMETRY_GLOBAL) {
+ if (geometry[i] == nGeometry::GLOBAL) {
curr_grid_res_cnt[i] = resource_count[i];
} else {
curr_grid_res_cnt[i] = spatial_resource_count[i].GetAmount(cell_id);
@@ -302,7 +302,7 @@
assert(resource_count.GetSize() == res_change.GetSize());
for (int i = 0; i < resource_count.GetSize(); i++) {
- if (geometry[i] == GEOMETRY_GLOBAL) {
+ if (geometry[i] == nGeometry::GLOBAL) {
resource_count[i] += res_change[i];
assert(resource_count[i] >= 0.0);
} else {
@@ -339,7 +339,7 @@
while (num_steps > PRECALC_DISTANCE) {
for (int i = 0; i < resource_count.GetSize(); i++) {
- if (geometry[i] == GEOMETRY_GLOBAL) {
+ if (geometry[i] == nGeometry::GLOBAL) {
resource_count[i] *= decay_precalc(i, PRECALC_DISTANCE);
resource_count[i] += inflow_precalc(i, PRECALC_DISTANCE);
}
@@ -348,7 +348,7 @@
}
for (int i = 0; i < resource_count.GetSize(); i++) {
- if (geometry[i] == GEOMETRY_GLOBAL) {
+ if (geometry[i] == nGeometry::GLOBAL) {
resource_count[i] *= decay_precalc(i, num_steps);
resource_count[i] += inflow_precalc(i, num_steps);
}
@@ -359,7 +359,7 @@
while (spatial_update_time >= 1.0) {
spatial_update_time -= 1.0;
for (int i = 0; i < resource_count.GetSize(); i++) {
- if (geometry[i] != GEOMETRY_GLOBAL) {
+ if (geometry[i] != nGeometry::GLOBAL) {
spatial_resource_count[i].Source(inflow_rate[i]);
spatial_resource_count[i].Sink(decay_rate[i]);
spatial_resource_count[i].FlowAll();
Modified: trunk/source/main/cSpatialCountElem.cc
===================================================================
--- trunk/source/main/cSpatialCountElem.cc 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/cSpatialCountElem.cc 2005-10-06 23:30:43 UTC (rev 333)
@@ -9,9 +9,7 @@
#include "cSpatialCountElem.h"
#endif
-#ifndef RESOURCE_COUNT_MACROS_HH
-#include "resource_count_macros.hh"
-#endif
+const int MAXFLOWPTS = 8;
cSpatialCountElem::cSpatialCountElem (double initamount) {
amount = initamount;
Modified: trunk/source/main/cSpatialResCount.cc
===================================================================
--- trunk/source/main/cSpatialResCount.cc 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/cSpatialResCount.cc 2005-10-06 23:30:43 UTC (rev 333)
@@ -64,7 +64,7 @@
ydiffuse = 1.0;
xgravity = 0.0;
ygravity = 0.0;
- geometry = GEOMETRY_GLOBAL;
+ geometry = nGeometry::GLOBAL;
}
void cSpatialResCount::ResizeClear(int inworld_x, int inworld_y,
@@ -106,7 +106,7 @@
/* Fix links for top, bottom and sides for non-torus */
- if (geometry == GEOMETRY_GRID) {
+ if (geometry == nGeometry::GRID) {
/* Top and bottom */
for (i = 0; i < world_x; i++) {
Modified: trunk/source/main/cStats.cc
===================================================================
--- trunk/source/main/cStats.cc 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/cStats.cc 2005-10-06 23:30:43 UTC (rev 333)
@@ -710,7 +710,7 @@
df.Write( GetUpdate(), "Update");
for (int i = 0; i < resource_count.GetSize(); i++) {
df.Write( resource_count[i], resource_names[i] );
- if (resource_geometry[i] != GEOMETRY_GLOBAL) {
+ if (resource_geometry[i] != nGeometry::GLOBAL) {
PrintSpatialResData(filename, i);
}
}
Modified: trunk/source/main/cStats.h
===================================================================
--- trunk/source/main/cStats.h 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/cStats.h 2005-10-06 23:30:43 UTC (rev 333)
@@ -36,11 +36,8 @@
#ifndef TDATAMANAGER_HH
#include "tDataManager.hh"
#endif
+#include "nGeometry.h"
-#define GEOMETRY_GLOBAL 0
-#define GEOMETRY_GRID 1
-#define GEOMETRY_TORUS 2
-
template <class T> class tDataManager; // aggregate
class cDataFileManager; // aggregate
class cDoubleSum; // aggregate
Added: trunk/source/main/nGeometry.h
===================================================================
--- trunk/source/main/nGeometry.h 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/nGeometry.h 2005-10-06 23:30:43 UTC (rev 333)
@@ -0,0 +1,21 @@
+/*
+ * nGeometry.h
+ * Avida2
+ *
+ * Created by David on 10/6/05.
+ * Copyright 2005 Michigan State University. All rights reserved.
+ *
+ */
+
+#ifndef nGeometry_h
+#define nGeometry_h
+
+namespace nGeometry {
+ enum {
+ GLOBAL = 0,
+ GRID,
+ TORUS
+ };
+}
+
+#endif
Modified: trunk/source/main/nMutation.h
===================================================================
--- trunk/source/main/nMutation.h 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/nMutation.h 2005-10-06 23:30:43 UTC (rev 333)
@@ -1,12 +1,14 @@
-//////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1993 - 2003 California Institute of Technology //
-// //
-// Read the COPYING and README files, or contact 'avida at alife.org', //
-// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
-//////////////////////////////////////////////////////////////////////////////
+/*
+ * nGeometry.h
+ * Avida2
+ *
+ * Created by David on 10/5/05.
+ * Copyright 2005 Michigan State University. All rights reserved.
+ *
+ */
-#ifndef MUTATION_MACROS_HH
-#define MUTATION_MACROS_HH
+#ifndef nMutation_h
+#define nMutation_h
namespace nMutation {
enum {
Copied: trunk/source/main/nReaction.h (from rev 331, trunk/source/main/reaction_macros.hh)
===================================================================
--- trunk/source/main/reaction_macros.hh 2005-10-05 23:40:31 UTC (rev 331)
+++ trunk/source/main/nReaction.h 2005-10-06 23:30:43 UTC (rev 333)
@@ -0,0 +1,21 @@
+/*
+ * nReaction.h
+ * Avida2
+ *
+ * Created by David on 10/6/05.
+ * Copyright 2005 Michigan State University. All rights reserved.
+ *
+ */
+
+#ifndef nReaction_h
+#define nReaction_h
+
+namespace nReaction {
+ enum {
+ PROCTYPE_ADD = 0,
+ PROCTYPE_MULT,
+ PROCTYPE_POW
+ };
+}
+
+#endif
Deleted: trunk/source/main/reaction_macros.hh
===================================================================
--- trunk/source/main/reaction_macros.hh 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/reaction_macros.hh 2005-10-06 23:30:43 UTC (rev 333)
@@ -1,15 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1993 - 2001 California Institute of Technology //
-// //
-// Read the COPYING and README files, or contact 'avida at alife.org', //
-// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef REACTION_MACROS_HH
-#define REACTION_MACROS_HH
-
-#define REACTION_PROCTYPE_ADD 0
-#define REACTION_PROCTYPE_MULT 1
-#define REACTION_PROCTYPE_POW 2
-
-#endif
Deleted: trunk/source/main/resource_count_macros.hh
===================================================================
--- trunk/source/main/resource_count_macros.hh 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/resource_count_macros.hh 2005-10-06 23:30:43 UTC (rev 333)
@@ -1,17 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1993 - 2001 California Institute of Technology //
-// //
-// Read the COPYING and README files, or contact 'avida at alife.org', //
-// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef RESOURCE_COUNT_MACROS_HH
-#define RESOURCE_COUNT_MACROS_HH
-
-#define GEOMETRY_GLOBAL 0
-#define GEOMETRY_GRID 1
-#define GEOMETRY_TORUS 2
-
-#define MAXFLOWPTS 8
-
-#endif
Deleted: trunk/source/main/resource_macros.hh
===================================================================
--- trunk/source/main/resource_macros.hh 2005-10-06 23:02:07 UTC (rev 332)
+++ trunk/source/main/resource_macros.hh 2005-10-06 23:30:43 UTC (rev 333)
@@ -1,15 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1993 - 2003 California Institute of Technology //
-// //
-// Read the COPYING and README files, or contact 'avida at alife.org', //
-// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef RESOURCE_MACROS_HH
-#define RESOURCE_MACROS_HH
-
-#define GEOMETRY_GLOBAL 0
-#define GEOMETRY_GRID 1
-#define GEOMETRY_TORUS 2
-
-#endif
More information about the Avida-cvs
mailing list