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

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2007-01-16 09:22:21 -0500 (Tue, 16 Jan 2007)
New Revision: 1195

Modified:
   development/source/main/cTaskLib.cc
Log:
Ack... more type safety madness.

Modified: development/source/main/cTaskLib.cc
===================================================================
--- development/source/main/cTaskLib.cc	2007-01-16 13:56:28 UTC (rev 1194)
+++ development/source/main/cTaskLib.cc	2007-01-16 14:22:21 UTC (rev 1195)
@@ -1898,7 +1898,7 @@
   double quality = 0.0;
   const cArgContainer& args = ctx.GetTaskEntry()->GetArguments();
 
-  int diff = abs(args.GetInt(0) - ctx.GetOutputBuffer()[0]);
+  long long diff = llabs((long long)args.GetInt(0) - ctx.GetOutputBuffer()[0]);
   int threshold = args.GetInt(1);
     
   if (threshold < 0 || diff <= threshold) { // Negative threshold == infinite
@@ -2119,7 +2119,7 @@
   for (int i = 0; i < input_size; i ++) {
     for (int j = 0; j < input_size; j ++) {
       if (i == j) continue;
-      long long cur_diff = labs((long long)(input_buffer[i] * input_buffer[j]) - test_output);
+      long long cur_diff = llabs((long long)(input_buffer[i] * input_buffer[j]) - test_output);
       if (cur_diff < diff) diff = cur_diff;
     }
   }
@@ -2163,7 +2163,7 @@
   for (int i = 0; i < input_size; i ++) {
     for (int j = 0; j < input_size; j ++) {
       if (i == j || input_buffer[j] == 0) continue;
-      long long cur_diff = labs((long long)(input_buffer[i] / input_buffer[j]) - test_output);
+      long long cur_diff = llabs((long long)(input_buffer[i] / input_buffer[j]) - test_output);
       if (cur_diff < diff) diff = cur_diff;
     }
   }
@@ -2205,7 +2205,7 @@
   long long diff = ((long long)INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long long cur_diff = labs((long long)(log(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
+    long long cur_diff = llabs((long long)(log(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }
   
@@ -2247,7 +2247,7 @@
   long long diff = ((long long)INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long long cur_diff = labs((long long)(log2(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
+    long long cur_diff = llabs((long long)(log2(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }
   
@@ -2289,7 +2289,7 @@
   long long diff = ((long long)INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long long cur_diff = labs((long long)(log10(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
+    long long cur_diff = llabs((long long)(log10(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }
   
@@ -2331,7 +2331,7 @@
   long long diff = ((long long)INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long long cur_diff = labs((long long)(sqrt(fabs(double(input_buffer[i])))) - test_output);
+    long long cur_diff = llabs((long long)(sqrt(fabs(double(input_buffer[i])))) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }
   
@@ -2373,7 +2373,7 @@
   long long diff = ((long long)INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long long cur_diff = labs((long long)(sin(double(input_buffer[i]) / dCastPrecision) * dCastPrecision) - test_output);
+    long long cur_diff = llabs((long long)(sin(double(input_buffer[i]) / dCastPrecision) * dCastPrecision) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }
   
@@ -2414,7 +2414,7 @@
   long long diff = ((long long)INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long long cur_diff = labs((long long)(cos(double(input_buffer[i]) / dCastPrecision) * dCastPrecision) - test_output);
+    long long cur_diff = llabs((long long)(cos(double(input_buffer[i]) / dCastPrecision) * dCastPrecision) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }