[avida-cvs] avida CVS commits: /current/source/main environment.cc
bckirkup
avida-cvs at alife.org
Fri Jul 11 21:50:07 PDT 2003
bckirkup Fri Jul 11 13:50:07 2003 EDT
Modified files:
/avida/current/source/main environment.cc
Log:
fixed error in detect code
Index: avida/current/source/main/environment.cc
diff -u avida/current/source/main/environment.cc:1.14 avida/current/source/main/environment.cc:1.15
--- avida/current/source/main/environment.cc:1.14 Fri Jul 11 13:44:27 2003
+++ avida/current/source/main/environment.cc Fri Jul 11 13:50:06 2003
@@ -782,14 +782,15 @@
// Determine detection events
cResource * detected = cur_process->GetDetect();
- const int detected_id = detected->GetID();
- int real_amount = resource_count[detected_id];
- double estimated_amount =
+ if (detected != NULL)
+ {const int detected_id = detected->GetID();
+ int real_amount = resource_count[detected_id];
+ double estimated_amount =
g_random.GetRandNormal(real_amount, cur_process->GetDetectionError()*real_amount);
- if (estimated_amount < cur_process->GetDetectionThreshold())
+ if (estimated_amount < cur_process->GetDetectionThreshold())
result.Detect(detected_id, 0.0);
- else result.Detect(detected_id, estimated_amount);
-
+ else result.Detect(detected_id, estimated_amount);
+ }
// Determine byproducts
cResource * product = cur_process->GetProduct();
More information about the Avida-cvs
mailing list