Erwan

- Fix issue 194
- Attempt at doing basic AI tests

projects/mtg/src/utils.cpp

@@ -1,9 +1,37 @@
 #include "../include/config.h"
 #include "../include/utils.h"
+#include <vector>
+using std::vector;
 
+int randValuesCursor = -1;
+vector<int>randValues;
 
+int loadRandValues(string s){
+  randValues.clear();
+  randValuesCursor = -1;
+    while (s.size()){
+      unsigned int value;
+      size_t limiter = s.find(",");
+      if (limiter != string::npos){
+	      value = atoi(s.substr(0,limiter).c_str());
+	      s = s.substr(limiter+1);
+      }else{
+	      value = atoi(s.c_str());
+	      s = "";
+      }
+      if (value) randValues.push_back(value);
+    }
+    if (randValues.size()) randValuesCursor = 0;
+    return 1;
+}
 
-
+int WRand(){
+  if (randValuesCursor == -1) return rand();
+  int result = randValues[randValuesCursor];
+  randValuesCursor++;
+  if ((size_t)randValuesCursor >= randValues.size()) randValuesCursor = 0;
+  return result;
+}
 
 int filesize(const char * filename){
   int file_size = 0;
@@ -60,92 +88,92 @@ void dumpStack()
 }
 #endif
 
-
-/* RAM simple check functions source */
-
-
-// *** FUNCTIONS ***
-
-u32 ramAvailableLineareMax (void)
-{
- u32 size, sizeblock;
- u8 *ram;
-
-
- // Init variables
- size = 0;
- sizeblock = RAM_BLOCK;
-
- // Check loop
- while (sizeblock)
- {
-  // Increment size
-  size += sizeblock;
-
-  // Allocate ram
-  ram = (u8 *) malloc(size);
-
-  // Check allocate
-  if (!(ram))
-  {
-   // Restore old size
-   size -= sizeblock;
-
-   // Size block / 2
-   sizeblock >>= 1;
-  }
-  else
-   free(ram);
- }
-
- return size;
-}
-
-u32 ramAvailable (void)
-{
- u8 **ram, **temp;
- u32 size, count, x;
-
-
- // Init variables
- ram = NULL;
- size = 0;
- count = 0;
-
- // Check loop
- for (;;)
- {
-  // Check size entries
-  if (!(count % 10))
-  {
-   // Allocate more entries if needed
-   temp = (u8**) realloc(ram,sizeof(u8 *) * (count + 10));
-   if (!(temp)) break;
- 
-   // Update entries and size (size contains also size of entries)
-   ram = temp;
-   size += (sizeof(u8 *) * 10);
-  }
-
-  // Find max lineare size available
-  x = ramAvailableLineareMax();
-  if (!(x)) break;
-
-  // Allocate ram
-  ram[count] = (u8 *) malloc(x);
-  if (!(ram[count])) break;
-
-  // Update variables
-  size += x;
-  count++;
- }
-
- // Free ram
- if (ram)
- {
-  for (x=0;x<count;x++) free(ram[x]);
-  free(ram);
- }
-
- return size;
+
+/* RAM simple check functions source */
+
+
+// *** FUNCTIONS ***
+
+u32 ramAvailableLineareMax (void)
+{
+ u32 size, sizeblock;
+ u8 *ram;
+
+
+ // Init variables
+ size = 0;
+ sizeblock = RAM_BLOCK;
+
+ // Check loop
+ while (sizeblock)
+ {
+  // Increment size
+  size += sizeblock;
+
+  // Allocate ram
+  ram = (u8 *) malloc(size);
+
+  // Check allocate
+  if (!(ram))
+  {
+   // Restore old size
+   size -= sizeblock;
+
+   // Size block / 2
+   sizeblock >>= 1;
+  }
+  else
+   free(ram);
+ }
+
+ return size;
+}
+
+u32 ramAvailable (void)
+{
+ u8 **ram, **temp;
+ u32 size, count, x;
+
+
+ // Init variables
+ ram = NULL;
+ size = 0;
+ count = 0;
+
+ // Check loop
+ for (;;)
+ {
+  // Check size entries
+  if (!(count % 10))
+  {
+   // Allocate more entries if needed
+   temp = (u8**) realloc(ram,sizeof(u8 *) * (count + 10));
+   if (!(temp)) break;
+ 
+   // Update entries and size (size contains also size of entries)
+   ram = temp;
+   size += (sizeof(u8 *) * 10);
+  }
+
+  // Find max lineare size available
+  x = ramAvailableLineareMax();
+  if (!(x)) break;
+
+  // Allocate ram
+  ram[count] = (u8 *) malloc(x);
+  if (!(ram[count])) break;
+
+  // Update variables
+  size += x;
+  count++;
+ }
+
+ // Free ram
+ if (ram)
+ {
+  for (x=0;x<count;x++) free(ram[x]);
+  free(ram);
+ }
+
+ return size;
 }