Changeset 68 for cpp/gdk

Timestamp:

01/31/11 23:18:54 (14 years ago)

Author:

Maciej Komosinski

Message:

added missing sources; updated sources for compatibility with vs2008 and added project files

Location:

cpp/gdk

Files:

• 3d.cpp (modified) (1 diff)
• GDK.dsw (deleted)
• GDK.sln (added)
• collectionobj.cpp (added)
• collectionobj.h (added)
• convtest.dsp (deleted)
• convtest.vcproj (added)
• gdktest.cpp (modified) (2 diffs)
• gdktest.dsp (deleted)
• gdktest.vcproj (added)
• genotest.dsp (deleted)
• genotest.vcproj (added)
• hashtable.cpp (added)
• hashtable.h (added)
• loadertest.dsp (deleted)
• loadertest.vcproj (added)
• neuroclsobject.cpp (added)
• neuroclsobject.h (added)
• neuroimpl.cpp (modified) (1 diff)
• neurotest.dsp (deleted)
• neurotest.vcproj (added)
• nonstd.h (modified) (4 diffs)
• nonstd_io.h (modified) (1 diff)
• paramvmobj.cpp (added)
• paramvmobj.h (added)
• stderrors.cpp (added)
• stderrors.h (added)

cpp/gdk/3d.cpp

@@ -3 +3 @@
 // Refer to http://www.framsticks.com/ for further information.
 
+#include "nonstd.h"
 #include <math.h>
 #include <string.h>
-#include "nonstd.h"
 #include "3d.h"
 #include "framsg.h"

cpp/gdk/gdktest.cpp

@@ -185 +185 @@
 printf("Neuro::getClass() gives you information about basic characteristic\n"
        "of the class, that can be analyzed automatically.\n");
-printf("For the current object we can get know, that this object likes to have ");
+printf("For the current object we can learn that it supports ");
 if (cl->getPreferredInputs()<0) printf("any number of inputs");
   else if (cl->getPreferredInputs()==0) printf("no inputs");
   else printf("%d inputs",cl->getPreferredInputs());
 printf(" (getPreferredInputs()) ");
-printf(cl->getPreferredOutput()?"and provides meaningful output signal (getPreferredOutput==1).\n":"and doesn't provide useful output signal (getPreferredOutput==0).\n");
+printf(cl->getPreferredOutput()?"and provides meaningful output signal (getPreferredOutput()==1).\n":"and doesn't provide useful output signal (getPreferredOutput()==0).\n");
 
 SyntParam p=n->classProperties();
@@ -335 +335 @@
        "Hints:\n"
        "  1. You can redirect output: gdktest >filename.txt\n"
-       "  2. Each run can yield different results because some\n"
+       "  2. Each run can yield different results, because some\n"
        "     values are randomly generated.\n"
-       "  3. Application will use custom genotype passed as\n"
-       "     a commandline parameter: gdktest X\n"
+       "  3. This application will use custom genotype passed as\n"
+       "     a commandline parameter: gdktest XX\n"
        "\n");
 return 0;

cpp/gdk/neuroimpl.cpp

@@ -5 +5 @@
 #include "neuroimpl.h"
 #include "neurofactory.h"
-#ifndef NOCREATUREOBJECT
+#ifdef NOCREATUREOBJECT
+#include "neuroclsobject.h"
+#else
 #include "creature.h"
 #include "creatmechobj.h"

cpp/gdk/nonstd.h

@@ -26 +26 @@
  #include <stdarg.h>
  #define vsnprintf _vsnprintf
- #define _USE_MATH_DEFINES
-
- #ifndef M_PI
- #define M_PI 3.1415926535897932384626433832795
- #endif
- #ifndef M_PI_2
- #define M_PI_2 (M_PI/2)
- #endif
+ #define _USE_MATH_DEFINES //after this is defined, the next #include <math.h> or <cmath> will define:
+ //#ifndef M_PI
+ //#define M_PI 3.1415926535897932384626433832795
+ //#endif
+ //#ifndef M_PI_2
+ //#define M_PI_2 (M_PI/2)
+ //#endif
 
 #endif
@@ -43 +42 @@
         #define PATHSEPARATORSTRING "\\"
         #define FPU_THROWS_EXCEPTIONS
+        #define FOPEN_READ "rt"
+        #define FOPEN_WRITE "wt"
+        #define FOPEN_APPEND "at"
 #else
         #define LONGLONG long long int
@@ -52 +54 @@
         #define fileExists(f) (!access(f,0))
         #include "stdlib.h" //random
-        #define FOPEN_READ "rt"
-        #define FOPEN_WRITE "wt"
-        #define FOPEN_APPEND "at"
         #define rnd01 ((double)((double)_lrand()/(double)(LRAND_MAX+1)))
         //#define rnd01 ((double)((double)rand()/(RAND_MAX+1)))
@@ -66 +65 @@
         #endif
 
-        #define FOPEN_WRITE "wa"
-        #define FOPEN_APPEND "aa"
-        #define FOPEN_READ "ra"
         //#define FLOATRAND
         #ifdef FLOATRAND

cpp/gdk/nonstd_io.h

@@ -1 +1 @@
 // int access(const char *pathname, int mode);
+
 #ifdef _Windows
+
+
+#ifndef _MSC_VER
  #include <dir.h> 
- #include <io.h> //include io.h przed dir.h powoduje ze w simul.h nie poznaje klasy SimWorld - szokujacy i niewyjasniony blad. co wiecej w projekcie GUI go nie ma a w CLI jest - moze wplyw tych globalnych definicji typu NOVCL, NO_STRICT itp?
+#endif
+ #include <io.h> //borland compiler: include <io.h> before <dir.h> causes the SimWorld class in "simul.h" be unrecognized, for unknown reason :O moreover, this problem is only pertinent to the CLI project, not GUI. Maybe this is caused by global defines like NOVCL, NO_STRICT etc.?
  #define makeDirectory(name) mkdir(name) 
+
+
 #else
+
+
  #include <unistd.h>
  #include <sys/stat.h>
  #define makeDirectory(name) mkdir(name,0777)
+
 #endif
-