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

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2007-01-15 15:18:45 -0500 (Mon, 15 Jan 2007)
New Revision: 1193

Modified:
   development/source/main/cTaskLib.cc
Log:
Math tasks long --> long long.

Modified: development/source/main/cTaskLib.cc
===================================================================
--- development/source/main/cTaskLib.cc	2007-01-15 18:55:16 UTC (rev 1192)
+++ development/source/main/cTaskLib.cc	2007-01-15 20:18:45 UTC (rev 1193)
@@ -2111,15 +2111,15 @@
   const cArgContainer& args = ctx.GetTaskEntry()->GetArguments();
 
   const tBuffer<int>& input_buffer = ctx.GetInputBuffer();
-  const long test_output = ctx.GetOutputBuffer()[0];
+  const long long test_output = ctx.GetOutputBuffer()[0];
   const int input_size = input_buffer.GetNumStored();
   
-  long diff = (INT_MAX + 1) * 2;
+  long long diff = (INT_MAX + 1) * 2;
 
   for (int i = 0; i < input_size; i ++) {
     for (int j = 0; j < input_size; j ++) {
       if (i == j) continue;
-      long cur_diff = labs(long(input_buffer[i] * input_buffer[j]) - test_output);
+      long long cur_diff = labs((long long)(input_buffer[i] * input_buffer[j]) - test_output);
       if (cur_diff < diff) diff = cur_diff;
     }
   }
@@ -2155,15 +2155,15 @@
   const cArgContainer& args = ctx.GetTaskEntry()->GetArguments();
   
   const tBuffer<int>& input_buffer = ctx.GetInputBuffer();
-  const long test_output = ctx.GetOutputBuffer()[0];
+  const long long test_output = ctx.GetOutputBuffer()[0];
   const int input_size = input_buffer.GetNumStored();
   
-  long diff = (INT_MAX + 1) * 2;
+  long long diff = (INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
     for (int j = 0; j < input_size; j ++) {
       if (input_buffer[j] == 0) continue;
-      long cur_diff = labs(long(input_buffer[i] / input_buffer[j]) - test_output);
+      long long cur_diff = labs((long long)(input_buffer[i] / input_buffer[j]) - test_output);
       if (cur_diff < diff) diff = cur_diff;
     }
   }
@@ -2199,13 +2199,13 @@
   const cArgContainer& args = ctx.GetTaskEntry()->GetArguments();
   
   const tBuffer<int>& input_buffer = ctx.GetInputBuffer();
-  const long test_output = ctx.GetOutputBuffer()[0];
+  const long long test_output = ctx.GetOutputBuffer()[0];
   const int input_size = input_buffer.GetNumStored();
   
-  long diff = (INT_MAX + 1) * 2;
+  long long diff = (INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long cur_diff = labs(long(log(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
+    long long cur_diff = labs((long long)(log(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }
   
@@ -2241,13 +2241,13 @@
   const cArgContainer& args = ctx.GetTaskEntry()->GetArguments();
   
   const tBuffer<int>& input_buffer = ctx.GetInputBuffer();
-  const long test_output = ctx.GetOutputBuffer()[0];
+  const long long test_output = ctx.GetOutputBuffer()[0];
   const int input_size = input_buffer.GetNumStored();
   
-  long diff = (INT_MAX + 1) * 2;
+  long long diff = (INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long cur_diff = labs(long(log2(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
+    long long cur_diff = labs((long long)(log2(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }
   
@@ -2283,13 +2283,13 @@
   const cArgContainer& args = ctx.GetTaskEntry()->GetArguments();
   
   const tBuffer<int>& input_buffer = ctx.GetInputBuffer();
-  const long test_output = ctx.GetOutputBuffer()[0];
+  const long long test_output = ctx.GetOutputBuffer()[0];
   const int input_size = input_buffer.GetNumStored();
   
-  long diff = (INT_MAX + 1) * 2;
+  long long diff = (INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long cur_diff = labs(long(log10(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
+    long long cur_diff = labs((long long)(log10(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }
   
@@ -2325,13 +2325,13 @@
   const cArgContainer& args = ctx.GetTaskEntry()->GetArguments();
   
   const tBuffer<int>& input_buffer = ctx.GetInputBuffer();
-  const long test_output = ctx.GetOutputBuffer()[0];
+  const long long test_output = ctx.GetOutputBuffer()[0];
   const int input_size = input_buffer.GetNumStored();
   
-  long diff = (INT_MAX + 1) * 2;
+  long long diff = (INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long cur_diff = labs(long(sqrt(fabs(double(input_buffer[i])))) - test_output);
+    long long cur_diff = labs((long long)(sqrt(fabs(double(input_buffer[i])))) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }
   
@@ -2367,13 +2367,13 @@
   const cArgContainer& args = ctx.GetTaskEntry()->GetArguments();
   
   const tBuffer<int>& input_buffer = ctx.GetInputBuffer();
-  const long test_output = ctx.GetOutputBuffer()[0];
+  const long long test_output = ctx.GetOutputBuffer()[0];
   const int input_size = input_buffer.GetNumStored();
   
-  long diff = (INT_MAX + 1) * 2;
+  long long diff = (INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long cur_diff = labs(long(sin(double(input_buffer[i]) / dCastPrecision) * dCastPrecision) - test_output);
+    long long cur_diff = labs((long 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 long test_output = ctx.GetOutputBuffer()[0];
+  const long long test_output = ctx.GetOutputBuffer()[0];
   const int input_size = input_buffer.GetNumStored();
   
-  long diff = (INT_MAX + 1) * 2;
+  long long diff = (INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long cur_diff = labs(long(cos(double(input_buffer[i]) / dCastPrecision) * dCastPrecision) - test_output);
+    long long cur_diff = labs((long long)(cos(double(input_buffer[i]) / dCastPrecision) * dCastPrecision) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }