[Avida-SVN] r1192 - development/source/main

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2007-01-15 13:55:16 -0500 (Mon, 15 Jan 2007)
New Revision: 1192

Modified:
   development/source/main/cTaskLib.cc
Log:
Extend trig task difference range storage.


Modified: development/source/main/cTaskLib.cc
===================================================================
--- development/source/main/cTaskLib.cc	2007-01-15 17:22:58 UTC (rev 1191)
+++ development/source/main/cTaskLib.cc	2007-01-15 18:55:16 UTC (rev 1192)
@@ -2367,13 +2367,13 @@
   const cArgContainer& args = ctx.GetTaskEntry()->GetArguments();
   
   const tBuffer<int>& input_buffer = ctx.GetInputBuffer();
-  const int test_output = ctx.GetOutputBuffer()[0];
+  const long test_output = ctx.GetOutputBuffer()[0];
   const int input_size = input_buffer.GetNumStored();
   
-  int diff = INT_MAX;
+  long diff = (INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    int cur_diff = abs(static_cast<int>(sin(static_cast<double>(input_buffer[i]) / dCastPrecision) * dCastPrecision) - test_output);
+    long cur_diff = labs(long(sin(double(input_buffer[i]) / dCastPrecision) * dCastPrecision) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }
   
@@ -2408,13 +2408,13 @@
   const cArgContainer& args = ctx.GetTaskEntry()->GetArguments();
   
   const tBuffer<int>& input_buffer = ctx.GetInputBuffer();
-  const int test_output = ctx.GetOutputBuffer()[0];
+  const long test_output = ctx.GetOutputBuffer()[0];
   const int input_size = input_buffer.GetNumStored();
   
-  int diff = INT_MAX;
+  long diff = (INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    int cur_diff = abs(static_cast<int>(cos(static_cast<double>(input_buffer[i]) / dCastPrecision) * dCastPrecision) - test_output);
+    long cur_diff = labs(long(cos(double(input_buffer[i]) / dCastPrecision) * dCastPrecision) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }