Changeset 64 for cpp/gdk/model.cpp

Timestamp:

01/28/11 23:29:40 (13 years ago)

Author:

Maciej Komosinski

Message:

a lot of minor fixes

File:

• cpp/gdk/model.cpp (modified) (3 diffs)

cpp/gdk/model.cpp

@@ -1 @@
-// This file is a part of Framsticks GDK library.
-// Copyright (C) 2002-2006  Szymon Ulatowski.  See LICENSE.txt for details.
-// Refer to http://www.frams.alife.pl/ for further information.
+// This file is a part of the Framsticks GDK library.
+// Copyright (C) 2002-2011  Szymon Ulatowski.  See LICENSE.txt for details.
+// Refer to http://www.framsticks.com/ for further information.
 
 #include "nonstd.h"
@@ -960 +960 @@
                         }
                         }
-                if (final) if (j->d()>getMaxJoint().d.x)
+                if (final)
+                        {
+                        if (j->d()>getMaxJoint().d.x)
                         {
                         ret=0;
                         FMprintf("Model","internalCheck",FMLV_ERROR,"delta too big in joint #%d (%s)",
                                  i,(const char*)geno.getName());
+                        }
+                        else if (j->d()<getMinJoint().d.x)
+                        {
+                        ret=0;
+                        FMprintf("Model","internalCheck",FMLV_ERROR,"delta too small in joint #%d (%s)",
+                                 i,(const char*)geno.getName());
+                        }
                         }
                 }
@@ -1259 +1268 @@
 class MaxNeuro: public Neuro {public: MaxNeuro() {Param par(f0_neuro_paramtab,this);par.setMax();}};
 
-const Part& Model::getMinPart() {static MinPart part; return part;}
-const Part& Model::getMaxPart() {static MaxPart part; return part;}
-const Part& Model::getDefPart() {static Part part; return part;}
-const Joint& Model::getMinJoint() {static MinJoint joint; return joint;}
-const Joint& Model::getMaxJoint() {static MaxJoint joint; return joint;}
-const Joint& Model::getDefJoint() {static Joint joint; return joint;}
-const Neuro& Model::getMinNeuro() {static MinNeuro neuro; return neuro;}
-const Neuro& Model::getMaxNeuro() {static MaxNeuro neuro; return neuro;}
-const Neuro& Model::getDefNeuro() {static Neuro neuro; return neuro;}
+Part& Model::getMinPart() {static MinPart part; return part;}
+Part& Model::getMaxPart() {static MaxPart part; return part;}
+Part& Model::getDefPart() {static Part part; return part;}
+Joint& Model::getMinJoint() {static MinJoint joint; return joint;}
+Joint& Model::getMaxJoint() {static MaxJoint joint; return joint;}
+Joint& Model::getDefJoint() {static Joint joint; return joint;}
+Neuro& Model::getMinNeuro() {static MinNeuro neuro; return neuro;}
+Neuro& Model::getMaxNeuro() {static MaxNeuro neuro; return neuro;}
+Neuro& Model::getDefNeuro() {static Neuro neuro; return neuro;}