Changeset 64 for cpp/gdk/conv_f1.cpp

Timestamp:

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

Author:

Maciej Komosinski

Message:

a lot of minor fixes

File:

• cpp/gdk/conv_f1.cpp (modified) (4 diffs)

cpp/gdk/conv_f1.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 "conv_f1.h"
@@ -48 +48 @@
 void addOrRememberInput(int n1,int n2,float w)
                 {
-                if (!addInput(n1,n2,w,false))
-                        connections+=Connection(n1,n2,w);
+                //if (!addInput(n1,n2,w,false))
+                connections+=Connection(n1,n2,w);
                 }
 bool addInput(int n1,int n2,float w,bool final)
@@ -270 +270 @@
 }
 
-// remove leading & trailing whitespaces
-static void trim(SString& s)
-{
-const char*b=(const char*)s;
-const char*e=b+s.len();
-while((b<e)&&(*b<=' ')) b++;
-while((b<e)&&(e[-1]<=' ')) e--;
-if ((e-b)==s.len()) return;
-char* t=s.directWrite();
-if (t!=b) memmove(t,b,e-b);
-s.endWrite(e-b);
-}
-
 const char* Builder::growNeuro(const char* t, F1Props& props,int &hasmuscles)
 {
@@ -346 +333 @@
                                 haveclass=1;
                                 SString clsname(begin,t-begin);
-                                trim(clsname);
+                                clsname=trim(clsname);
                                 last_f1_neuro->setClassName(clsname);
                                 NeuroClass *cls=last_f1_neuro->getClass();