Changeset 522

Timestamp:

06/23/16 00:15:59 (8 years ago)

Author:

Maciej Komosinski

Message:

Code formatting

Location:

cpp

Files:

• common/loggers/loggers.cpp (modified) (1 diff)
• common/loggers/loggertostdout.cpp (modified) (1 diff)
• frams/genetics/defgenoconv.h (modified) (1 diff)
• frams/genetics/geno.cpp (modified) (13 diffs)
• frams/genetics/geno.h (modified) (1 diff)
• frams/model/model.cpp (modified) (18 diffs)
• frams/model/model.h (modified) (2 diffs)
• frams/util/extvalue.cpp (modified) (11 diffs)
• frams/util/extvalue.h (modified) (3 diffs)

cpp/common/loggers/loggers.cpp

@@ -155 +155 @@
 string LoggerToMemory::getCountSummary() const
 {
-if (getInfoCount())
+        if (getInfoCount())
         {
-        string msg;
-        if (getErrorCount())
-                msg=ssprintf("%d error(s)",getErrorCount());
-        int w;
-        if (w=getWarningCount()-getErrorCount())
-                msg+=ssprintf("%s%d warning(s)",(getErrorCount()?", ":""),w);
-        if (w=getInfoCount()-getWarningCount())
-                msg+=ssprintf("%s%d message(s)",(getWarningCount()?", ":""),w);
-        return msg;
+                string msg;
+                if (getErrorCount())
+                        msg = ssprintf("%d error(s)", getErrorCount());
+                int w;
+                if (w = getWarningCount() - getErrorCount())
+                        msg += ssprintf("%s%d warning(s)", (getErrorCount() ? ", " : ""), w);
+                if (w = getInfoCount() - getWarningCount())
+                        msg += ssprintf("%s%d message(s)", (getWarningCount() ? ", " : ""), w);
+                return msg;
         }
-return string("");
+        return string("");
 }
 

cpp/common/loggers/loggertostdout.cpp

@@ -12 +12 @@
 
 static const char* default_log_level_ansicolor[] =
-  { "[\033[2mDEBUG\033[0m] \033[2m", "", "[\033[33mWARN\033[0m] \033[1m", "[\033[1;31mERROR\033[0m] \033[1m", "[\033[1;31mCRITICAL\033[0m] \033[1m" };
+{ "[\033[2mDEBUG\033[0m] \033[2m", "", "[\033[33mWARN\033[0m] \033[1m", "[\033[1;31mERROR\033[0m] \033[1m", "[\033[1;31mCRITICAL\033[0m] \033[1m" };
 
 const char** LoggerToStdout::default_log_level[] =
- { LOG_LEVEL, default_log_level_ansicolor };
+{ LOG_LEVEL, default_log_level_ansicolor };
 
-const char* LoggerToStdout::default_log_format[]= //note trailing %s (so it's easy to append "\n" later)
- { LOG_FORMAT "%s", "%s%s.%s: %s\033[0m%s" };
+const char* LoggerToStdout::default_log_format[] = //note trailing %s (so it's easy to append "\n" later)
+{ LOG_FORMAT "%s", "%s%s.%s: %s\033[0m%s" };
 
 LoggerToStdout::LoggerToStdout(int opts, VirtFILE *_file)
         :LoggerBase(opts), file(_file)
 {
-log_format=default_log_format[console_color_mode];
-log_level=default_log_level[console_color_mode];
+        log_format = default_log_format[console_color_mode];
+        log_level = default_log_level[console_color_mode];
 }
 

cpp/frams/genetics/defgenoconv.h

@@ -9 +9 @@
 
 /// This GenoConvManager subclass allows you to add all "standard" converters in one go
-class DefaultGenoConvManager: public GenoConvManager
+class DefaultGenoConvManager : public GenoConvManager
 {
-  public:
-void addDefaultConverters();///< add all converters configured in gen-config file
+public:
+        void addDefaultConverters();///< add all converters configured in gen-config file
 };
 

cpp/frams/genetics/geno.cpp

@@ -12 +12 @@
 THREAD_LOCAL_DEF_PTR(GenoConvManager, geno_converters);
 
-Geno::Validators* Geno::getValidators() {return tlsGetPtr(geno_validators);}
-GenoConvManager* Geno::getConverters() {return tlsGetPtr(geno_converters);}
+Geno::Validators* Geno::getValidators() { return tlsGetPtr(geno_validators); }
+GenoConvManager* Geno::getConverters() { return tlsGetPtr(geno_converters); }
 
 Geno::Validators* Geno::useValidators(Validators* val)
-{return tlsSetPtr(geno_validators,val);}
+{
+        return tlsSetPtr(geno_validators, val);
+}
 GenoConvManager* Geno::useConverters(GenoConvManager* gcm)
-{return tlsSetPtr(geno_converters,gcm);}
+{
+        return tlsSetPtr(geno_converters, gcm);
+}
 
 void Geno::init(const SString& genstring, char genformat, const SString& genname, const SString& comment)
@@ -34 +38 @@
                 if (genstring.charAt(0) == '/')
                 {
-                        int end, error_end=-1;
+                        int end, error_end = -1;
                         switch (genstring.charAt(1))
                         {
                         case '/':
                                 genformat = genstring.charAt(2);
-                                if ((genformat=='\0')||isspace(genformat))
-                                        genformat=INVALID_FORMAT;
+                                if ((genformat == '\0') || isspace(genformat))
+                                        genformat = INVALID_FORMAT;
                                 if ((end = genstring.indexOf('\n')) >= 0)
                                 {
-                                        error_end=end;
-                                        if (end!=3) genformat=INVALID_FORMAT;
+                                        error_end = end;
+                                        if (end != 3) genformat = INVALID_FORMAT;
                                         gencopy = genstring.substr(end + 1);
                                         mapinshift = end + 1;
@@ -50 +54 @@
                                 else
                                 {
-                                        if (genstring.len()!=3) genformat=INVALID_FORMAT;
+                                        if (genstring.len() != 3) genformat = INVALID_FORMAT;
                                         gencopy = 0;
                                         mapinshift = genstring.len();
@@ -57 +61 @@
                         case '*':
                                 genformat = genstring.charAt(2);
-                                if ((genformat=='\0')||isspace(genformat))
-                                        genformat=INVALID_FORMAT;
+                                if ((genformat == '\0') || isspace(genformat))
+                                        genformat = INVALID_FORMAT;
                                 if ((end = genstring.indexOf("*/")) >= 0)
                                 {
-                                        error_end=end+2;
-                                        if (end!=3) genformat=INVALID_FORMAT;
+                                        error_end = end + 2;
+                                        if (end != 3) genformat = INVALID_FORMAT;
                                         gencopy = genstring.substr(end + 2);
                                         mapinshift = end + 2;
@@ -68 +72 @@
                                 else
                                 {
-                                        if (genstring.len()!=5) genformat=INVALID_FORMAT;
+                                        if (genstring.len() != 5) genformat = INVALID_FORMAT;
                                         gencopy = 0;
                                         mapinshift = genstring.len();
@@ -74 +78 @@
                                 break;
                         }
-                if (genformat==INVALID_FORMAT)
+                        if (genformat == INVALID_FORMAT)
                         {
-                        SString cut;
-                        if (error_end<0) error_end=genstring.len();
-                        static const int MAX_ERROR=20;
-                        if (error_end>MAX_ERROR)
-                                cut=genstring.substr(0,MAX_ERROR)+"...";
-                        else
-                                cut=genstring.substr(0,error_end);
-                        int lf=cut.indexOf('\n');
-                        if (lf>=0) cut=cut.substr(0,lf);
-                        logPrintf("Geno","init",LOG_ERROR,"Invalid genotype format declaration: '%s'%s",cut.c_str(),genname.len()?SString::sprintf(" in '%s'",genname.c_str()).c_str():"");
+                                SString cut;
+                                if (error_end<0) error_end = genstring.len();
+                                static const int MAX_ERROR = 20;
+                                if (error_end>MAX_ERROR)
+                                        cut = genstring.substr(0, MAX_ERROR) + "...";
+                                else
+                                        cut = genstring.substr(0, error_end);
+                                int lf = cut.indexOf('\n');
+                                if (lf >= 0) cut = cut.substr(0, lf);
+                                logPrintf("Geno", "init", LOG_ERROR, "Invalid genotype format declaration: '%s'%s", cut.c_str(), genname.len() ? SString::sprintf(" in '%s'", genname.c_str()).c_str() : "");
                         }
 
@@ -115 +119 @@
 
 Geno::Geno(const Geno& src)
-:gen(src.gen), name(src.name), format(src.format), txt(src.txt), isvalid(src.isvalid),
-f0gen(0), mapinshift(src.mapinshift), mapoutshift(src.mapinshift),
-multiline(src.multiline), owner(0)
+        :gen(src.gen), name(src.name), format(src.format), txt(src.txt), isvalid(src.isvalid),
+        f0gen(0), mapinshift(src.mapinshift), mapoutshift(src.mapinshift),
+        multiline(src.multiline), owner(0)
 {
         f0gen = src.f0gen ? new Geno(*src.f0gen) : 0; refcount = 1;
@@ -216 +220 @@
 {
         if (genpos > gen.len()) return -2;
-        if (genpos<0) return -1;
+        if (genpos < 0) return -1;
         return mapinshift + genpos;
 }
@@ -223 +227 @@
 {
         stringpos -= mapinshift;
-        if (stringpos>gen.len()) return -2;
+        if (stringpos > gen.len()) return -2;
         if (stringpos < 0) return -1;
         return stringpos;
@@ -255 +259 @@
         if (gen.len() == 0) { isvalid = 0; return; }
         if (format == INVALID_FORMAT) { isvalid = 0; return; }
-        Validators* vals=getValidators();
-        if (vals!=NULL)
-                {
+        Validators* vals = getValidators();
+        if (vals != NULL)
+        {
 #ifdef WARN_VALIDATION_INCONSISTENCY
                 vector<int> results;
                 int first_result=-1;
                 FOREACH(GenoValidator*, v, (*vals))
-                        {
+                {
                         int r=v->testGenoValidity(*this);
                         if (first_result<0) first_result=r;
                         results.push_back(r);
-                        }
+                }
                 int N=vals->size();
                 for(int i=1;i<N;i++)
                         if (results[i]!=results[0])
-                                {
-                                SString txt="Inconsistent validation results";
-                                for(int i=0;i<N;i++)
-                                        txt+=SString::sprintf(" %d",results[i]);
-                                txt+=" for genotype '";
-                                txt+=getGene();
-                                txt+="'";
-                                logPrintf("Geno","validate",LOG_WARN,txt.c_str());
-                                break;
-                                }
+                        {
+                        SString txt="Inconsistent validation results";
+                        for(int i=0;i<N;i++)
+                                txt+=SString::sprintf(" %d",results[i]);
+                        txt+=" for genotype '";
+                        txt+=getGene();
+                        txt+="'";
+                        logPrintf("Geno","validate",LOG_WARN,txt.c_str());
+                        break;
+                        }
                 isvalid=first_result;
                 if (isvalid>=0)
                         return;
 #else
-        FOREACH(GenoValidator*, v, (*vals))
-                if ((isvalid = v->testGenoValidity(*this)) >= 0)
-                        return;
+                FOREACH(GenoValidator*, v, (*vals))
+                        if ((isvalid = v->testGenoValidity(*this)) >= 0)
+                                return;
 #endif
-                }
+        }
         isvalid = 0;
         logPrintf("Geno", "validate", LOG_WARN, "Wrong configuration? No genotype validators defined for genetic format 'f%c'.", format);
@@ -295 +299 @@
 bool Geno::isValid(void)
 {
-        if (isvalid<0)
-                {
-                LoggerToMemory err(LoggerBase::Enable | LoggerToMemory::StoreAllMessages,LOG_INFO);
+        if (isvalid < 0)
+        {
+                LoggerToMemory err(LoggerBase::Enable | LoggerToMemory::StoreAllMessages, LOG_INFO);
                 validate();
                 err.disable();
-                string msg=err.getCountSummary();
-                if (msg.size()>0)
-                        {
-                        msg+=ssprintf(" while checking validity of '%s'",getName().c_str());
-                        msg+="\n";
-                        msg+=err.getMessages();
-                        logMessage("Geno","isValid",err.getErrorLevel(),msg.c_str());
-                        }
-                }
-        return isvalid>0;
+                string msg = err.getCountSummary();
+                if (msg.size() > 0)
+                {
+                        msg += ssprintf(" while checking validity of '%s'", getName().c_str());
+                        msg += "\n";
+                        msg += err.getMessages();
+                        logMessage("Geno", "isValid", err.getErrorLevel(), msg.c_str());
+                }
+        }
+        return isvalid > 0;
 }
 
@@ -316 +320 @@
         if (otherformat == getFormat()) { if (converter_missing) *converter_missing = false; return *this; }
 #ifndef NO_GENOCONVMANAGER
-        GenoConvManager *converters=getConverters();
+        GenoConvManager *converters = getConverters();
         if (converters)
         {
@@ -324 +328 @@
                                 f0gen = new Geno(converters->convert(*this, otherformat, NULL, converter_missing));
                         else
-                                { if (converter_missing) *converter_missing = false; }
+                        {
+                                if (converter_missing) *converter_missing = false;
+                        }
                         return *f0gen;
                 }

cpp/frams/genetics/geno.h

@@ -55 +55 @@
 
 public:
-        static const int INVALID_FORMAT='!';
+        static const int INVALID_FORMAT = '!';
         typedef SListTempl<GenoValidator*> Validators;
 

cpp/frams/model/model.cpp

@@ -11 +11 @@
 Model::Model()
 {
-autobuildmaps=false;
-init();
+        autobuildmaps = false;
+        init();
 }
 
 void Model::init()
 {
-partmappingchanged=0;
-buildstatus=empty;
-modelfromgenotype=0;
-startenergy=1.0;
-checklevel=1;
+        partmappingchanged = 0;
+        buildstatus = empty;
+        modelfromgenotype = 0;
+        startenergy = 1.0;
+        checklevel = 1;
 #ifdef MODEL_V1_COMPATIBLE
-oldneurocount=-1; // == unknown
-oldconnections=0;
+        oldneurocount=-1; // == unknown
+        oldconnections=0;
 #endif
-map=0;
-f0map=0;
-f0genoknown=1;
-shape=SHAPE_UNKNOWN;
+        map = 0;
+        f0map = 0;
+        f0genoknown = 1;
+        shape = SHAPE_UNKNOWN;
 }
 
 void Model::moveElementsFrom(Model &source)
 {
-int i;
-open();
-for (i=0;i<source.getPartCount();i++)
-        addPart(source.getPart(i));
-for (i=0;i<source.getJointCount();i++)
-        addJoint(source.getJoint(i));
-for (i=0;i<source.getNeuroCount();i++)
-        addNeuro(source.getNeuro(i));
-source.parts.clear(); source.joints.clear(); source.neurons.clear();
-source.clear();
+        int i;
+        open();
+        for (i = 0; i < source.getPartCount(); i++)
+                addPart(source.getPart(i));
+        for (i = 0; i < source.getJointCount(); i++)
+                addJoint(source.getJoint(i));
+        for (i = 0; i < source.getNeuroCount(); i++)
+                addNeuro(source.getNeuro(i));
+        source.parts.clear(); source.joints.clear(); source.neurons.clear();
+        source.clear();
 }
 
 void Model::internalCopy(const Model &mod)
 {
-geno=mod.geno;
-f0genoknown=0;
-startenergy=mod.startenergy;
-if (mod.getStatus()==valid)
-        {
-        modelfromgenotype=mod.modelfromgenotype;
-        {for (int i=0;i<mod.getPartCount();i++)
-                addPart(new Part(*mod.getPart(i)));}
-        {for (int i=0;i<mod.getJointCount();i++)
-                {
-                Joint *oldj=mod.getJoint(i);
-                Joint *j=new Joint(*oldj);
+        geno = mod.geno;
+        f0genoknown = 0;
+        startenergy = mod.startenergy;
+        if (mod.getStatus() == valid)
+        {
+                modelfromgenotype = mod.modelfromgenotype;
+                {for (int i = 0; i < mod.getPartCount(); i++)
+                        addPart(new Part(*mod.getPart(i))); }
+        {for (int i = 0; i < mod.getJointCount(); i++)
+        {
+                Joint *oldj = mod.getJoint(i);
+                Joint *j = new Joint(*oldj);
                 addJoint(j);
-                j->attachToParts(oldj->part1->refno,oldj->part2->refno);
-                }}
-        {for (int i=0;i<mod.getNeuroCount();i++)
-                {
-                Neuro *oldn=mod.getNeuro(i);
-                Neuro *n=new Neuro(*oldn);
+                j->attachToParts(oldj->part1->refno, oldj->part2->refno);
+        }}
+        {for (int i = 0; i < mod.getNeuroCount(); i++)
+        {
+                Neuro *oldn = mod.getNeuro(i);
+                Neuro *n = new Neuro(*oldn);
                 addNeuro(n);
-                if (oldn->part_refno>=0) n->attachToPart(oldn->part_refno);
+                if (oldn->part_refno >= 0) n->attachToPart(oldn->part_refno);
                 else n->attachToJoint(oldn->joint_refno);
-                }}
-        for (int i=0;i<mod.getNeuroCount();i++)
-                {
-                Neuro *oldn=mod.getNeuro(i);
-                Neuro *n=getNeuro(i);
-                for (int ni=0;ni < oldn->getInputCount();ni++)
+        }}
+                for (int i = 0; i < mod.getNeuroCount(); i++)
+                {
+                        Neuro *oldn = mod.getNeuro(i);
+                        Neuro *n = getNeuro(i);
+                        for (int ni = 0; ni < oldn->getInputCount(); ni++)
                         {
-                        double w;
-                        Neuro *oldinput=oldn->getInput(ni,w);
-                        SString info=n->getInputInfo(ni);
-                        n->addInput(getNeuro(oldinput->refno),w,&info);
+                                double w;
+                                Neuro *oldinput = oldn->getInput(ni, w);
+                                SString info = n->getInputInfo(ni);
+                                n->addInput(getNeuro(oldinput->refno), w, &info);
                         }
                 }
@@ -87 +87 @@
 
 
-Model::Model(const Geno &src,bool buildmaps)
+Model::Model(const Geno &src, bool buildmaps)
         :autobuildmaps(buildmaps)
-{init(src);}
+{
+        init(src);
+}
 
 void Model::operator=(const Model &mod)
 {
-clear();
-open();
-internalCopy(mod);
-buildstatus=mod.buildstatus;
-}
-
-Model::Model(const Model &mod,bool buildmaps)
+        clear();
+        open();
+        internalCopy(mod);
+        buildstatus = mod.buildstatus;
+}
+
+Model::Model(const Model &mod, bool buildmaps)
         :autobuildmaps(buildmaps)
 {
-init();
-open();
-internalCopy(mod);
-buildstatus=mod.buildstatus;
+        init();
+        open();
+        internalCopy(mod);
+        buildstatus = mod.buildstatus;
 }
 
 void Model::init(const Geno &src)
 {
-init();
-modelfromgenotype=1;
-geno=src;
-build();
+        init();
+        modelfromgenotype = 1;
+        geno = src;
+        build();
 }
 
 void Model::resetAllDelta()
 {
-for (int i=0;i<getJointCount();i++)
-        getJoint(i)->resetDelta();
+        for (int i = 0; i < getJointCount(); i++)
+                getJoint(i)->resetDelta();
 }
 
 void Model::useAllDelta(bool yesno)
 {
-for (int i=0;i<getJointCount();i++)
-        getJoint(i)->useDelta(yesno);
+        for (int i = 0; i < getJointCount(); i++)
+                getJoint(i)->useDelta(yesno);
 }
 
 Model::~Model()
 {
-delmodel_list.action((intptr_t)this);
-clear();
+        delmodel_list.action((intptr_t)this);
+        clear();
 }
 
 void Model::clear()
 {
-FOREACH(Part*,p,parts)
+        FOREACH(Part*, p, parts)
+                delete p;
+        FOREACH(Joint*, j, joints)
+                delete j;
+        FOREACH(Neuro*, n, neurons)
+                delete n;
+        parts.clear(); joints.clear(); neurons.clear();
+        delMap();
+        delF0Map();
+        init();
+        geno = Geno();
+        f0geno = Geno();
+}
+
+Part *Model::addPart(Part *p)
+{
+        p->owner = this;
+        p->refno = parts.size();
+        parts += p;
+        return p;
+}
+
+Joint *Model::addJoint(Joint *j)
+{
+        j->owner = this;
+        j->refno = joints.size();
+        joints += j;
+        return j;
+}
+
+Neuro *Model::addNeuro(Neuro *n)
+{
+        n->owner = this;
+        n->refno = neurons.size();
+        neurons += n;
+        return n;
+}
+
+void Model::removeNeuros(SList &nlist)
+{
+        FOREACH(Neuro*, nu, nlist)
+        {
+                int i = findNeuro(nu);
+                if (i >= 0) removeNeuro(i);
+        }
+}
+
+void Model::removePart(int partindex, int removeattachedjoints, int removeattachedneurons)
+{
+        Part *p = getPart(partindex);
+        if (removeattachedjoints)
+        {
+                SList jlist;
+                findJoints(jlist, p);
+                FOREACH(Joint*, j, jlist)
+                {
+                        int i = findJoint(j);
+                        if (i >= 0) removeJoint(i, removeattachedneurons);
+                }
+        }
+        if (removeattachedneurons)
+        {
+                SList nlist;
+                findNeuros(nlist, 0, p);
+                removeNeuros(nlist);
+        }
+        parts -= partindex;
         delete p;
-FOREACH(Joint*,j,joints)
+}
+
+void Model::removeJoint(int jointindex, int removeattachedneurons)
+{
+        Joint *j = getJoint(jointindex);
+        if (removeattachedneurons)
+        {
+                SList nlist;
+                findNeuros(nlist, 0, 0, j);
+                removeNeuros(nlist);
+        }
+        joints -= jointindex;
         delete j;
-FOREACH(Neuro*,n,neurons)
-        delete n;
-parts.clear(); joints.clear(); neurons.clear();
-delMap();
-delF0Map();
-init();
-geno=Geno();
-f0geno=Geno();
-}
-
-Part *Model::addPart(Part *p)
-{
-p->owner=this;
-p->refno=parts.size();
-parts+=p;
-return p;
-}
-
-Joint *Model::addJoint(Joint *j)
-{
-j->owner=this;
-j->refno=joints.size();
-joints+=j;
-return j;
-}
-
-Neuro *Model::addNeuro(Neuro *n)
-{
-n->owner=this; 
-n->refno=neurons.size();
-neurons+=n;
-return n;
-}
-
-void Model::removeNeuros(SList &nlist)
-{
-FOREACH(Neuro*,nu,nlist)
-        {
-        int i=findNeuro(nu);
-        if (i>=0) removeNeuro(i);
-        }
-}
-
-void Model::removePart(int partindex,int removeattachedjoints,int removeattachedneurons)
-{
-Part *p=getPart(partindex);
-if (removeattachedjoints)
-        {
-        SList jlist;
-        findJoints(jlist,p);
-        FOREACH(Joint*,j,jlist)
-                {
-                int i=findJoint(j);
-                if (i>=0) removeJoint(i,removeattachedneurons);
-                }
-        }
-if (removeattachedneurons)
-        {
-        SList nlist;
-        findNeuros(nlist,0,p);
-        removeNeuros(nlist);
-        }
-parts-=partindex;
-delete p;
-}
-
-void Model::removeJoint(int jointindex,int removeattachedneurons)
-{
-Joint *j=getJoint(jointindex);
-if (removeattachedneurons)
-        {
-        SList nlist;
-        findNeuros(nlist,0,0,j);
-        removeNeuros(nlist);
-        }
-joints-=jointindex;
-delete j;
-}
-
-void Model::removeNeuro(int neuroindex,bool removereferences)
-{
-Neuro* thisN=getNeuro(neuroindex);
-
-if (removereferences)
-        {
-        Neuro* n;
-// remove all references to thisN
-        for (int i=0;n=(Neuro*)neurons(i);i++)
-                {
-                Neuro *inp;
-                for (int j=0;inp=n->getInput(j);j++)
-                        if (inp==thisN)
+}
+
+void Model::removeNeuro(int neuroindex, bool removereferences)
+{
+        Neuro* thisN = getNeuro(neuroindex);
+
+        if (removereferences)
+        {
+                Neuro* n;
+                // remove all references to thisN
+                for (int i = 0; n = (Neuro*)neurons(i); i++)
+                {
+                        Neuro *inp;
+                        for (int j = 0; inp = n->getInput(j); j++)
+                                if (inp == thisN)
                                 {
                                 n->removeInput(j);
@@ -239 +241 @@
         }
 
-neurons-=neuroindex;
-delete thisN;
+        neurons -= neuroindex;
+        delete thisN;
 }
 
 MultiMap& Model::getMap()
 {
-if (!map) map=new MultiMap();
-return *map;
+        if (!map) map = new MultiMap();
+        return *map;
 }
 
 void Model::delMap()
 {
-if (map) {delete map; map=0;}
+        if (map) { delete map; map = 0; }
 }
 void Model::delF0Map()
 {
-if (f0map) {delete f0map; f0map=0;}
-}
-
-void Model::makeGenToGenMap(MultiMap& result,const MultiMap& gen1tomodel,const MultiMap& gen2tomodel)
-{
-result.clear();
-MultiMap m;
-m.addReversed(gen2tomodel);
-result.addCombined(gen1tomodel,m);
+        if (f0map) { delete f0map; f0map = 0; }
+}
+
+void Model::makeGenToGenMap(MultiMap& result, const MultiMap& gen1tomodel, const MultiMap& gen2tomodel)
+{
+        result.clear();
+        MultiMap m;
+        m.addReversed(gen2tomodel);
+        result.addCombined(gen1tomodel, m);
 }
 
 void Model::getCurrentToF0Map(MultiMap& result)
 {
-result.clear();
-if (!map) return;
-const MultiMap& f0m=getF0Map();
-makeGenToGenMap(result,*map,f0m);
+        result.clear();
+        if (!map) return;
+        const MultiMap& f0m = getF0Map();
+        makeGenToGenMap(result, *map, f0m);
 }
 
 void Model::rebuild(bool buildm)
 {
-autobuildmaps=buildm;
-clear();
-build();
+        autobuildmaps = buildm;
+        clear();
+        build();
 }
 
 void Model::initMap()
 {
-if (!map) map=new MultiMap();
-else map->clear();
+        if (!map) map = new MultiMap();
+        else map->clear();
 }
 
 void Model::initF0Map()
 {
-if (!f0map) f0map=new MultiMap();
-else f0map->clear();
+        if (!f0map) f0map = new MultiMap();
+        else f0map->clear();
 }
 
 void Model::build()
 {
-f0errorposition=-1;
-f0warnposition=-1;
-MultiMap *convmap=autobuildmaps ? new MultiMap() : NULL;
-f0geno=(geno.getFormat()=='0')? geno : geno.getConverted('0',convmap);
-f0genoknown=1;
-if (f0geno.isInvalid())
-        {
-        buildstatus=invalid;
-        if (convmap) delete convmap;
-        return;
-        }
-SString f0txt=f0geno.getGene();
-buildstatus=building; // was: open();
-if (autobuildmaps)
-        {
-        partmappingchanged=0;
-        initMap();
-        initF0Map();
-        }
-int pos=0,lnum=1,lastpos=0;
-SString line;
-MultiRange frommap;
-LoggerToMemory mh(LoggerBase::Enable | LoggerBase::DontBlock);
-for (;f0txt.getNextToken(pos,line,'\n');lnum++)
-        {
-        if (autobuildmaps)
-                {
-                frommap.clear();
-                frommap.add(lastpos,pos-1);
-                }
-        mh.reset();
-        if (singleStepBuild(line,lnum,autobuildmaps ? (&frommap) : 0) == -1)
-                {
-                buildstatus=invalid;
-                f0errorposition=lastpos;
+        f0errorposition = -1;
+        f0warnposition = -1;
+        MultiMap *convmap = autobuildmaps ? new MultiMap() : NULL;
+        f0geno = (geno.getFormat() == '0') ? geno : geno.getConverted('0', convmap);
+        f0genoknown = 1;
+        if (f0geno.isInvalid())
+        {
+                buildstatus = invalid;
                 if (convmap) delete convmap;
                 return;
-                }
-        if (mh.getWarningCount())
-                {if (f0warnposition<0) f0warnposition=lastpos;}
-        lastpos=pos;
-        }
-mh.disable();
-close();
-if (convmap)
-        {
-        *f0map=*map;
-        if (geno.getFormat()!='0')
-                {
-                MultiMap tmp;
-                tmp.addCombined(*convmap,getMap());
-                *map=tmp;
-                }
-        delete convmap;
+        }
+        SString f0txt = f0geno.getGene();
+        buildstatus = building; // was: open();
+        if (autobuildmaps)
+        {
+                partmappingchanged = 0;
+                initMap();
+                initF0Map();
+        }
+        int pos = 0, lnum = 1, lastpos = 0;
+        SString line;
+        MultiRange frommap;
+        LoggerToMemory mh(LoggerBase::Enable | LoggerBase::DontBlock);
+        for (; f0txt.getNextToken(pos, line, '\n'); lnum++)
+        {
+                if (autobuildmaps)
+                {
+                        frommap.clear();
+                        frommap.add(lastpos, pos - 1);
+                }
+                mh.reset();
+                if (singleStepBuild(line, lnum, autobuildmaps ? (&frommap) : 0) == -1)
+                {
+                        buildstatus = invalid;
+                        f0errorposition = lastpos;
+                        if (convmap) delete convmap;
+                        return;
+                }
+                if (mh.getWarningCount())
+                {
+                        if (f0warnposition < 0) f0warnposition = lastpos;
+                }
+                lastpos = pos;
+        }
+        mh.disable();
+        close();
+        if (convmap)
+        {
+                *f0map = *map;
+                if (geno.getFormat() != '0')
+                {
+                        MultiMap tmp;
+                        tmp.addCombined(*convmap, getMap());
+                        *map = tmp;
+                }
+                delete convmap;
         }
 }
@@ -354 +358 @@
 const MultiMap& Model::getF0Map()
 {
-if (!f0map)
-        {
-        f0map=new MultiMap();
-        makeGeno(f0geno,f0map);
-        f0genoknown=1;
-        }
-return *f0map;
+        if (!f0map)
+        {
+                f0map = new MultiMap();
+                makeGeno(f0geno, f0map);
+                f0genoknown = 1;
+        }
+        return *f0map;
 }
 
 Geno Model::rawGeno()
 {
-Geno tmpgen;
-makeGeno(tmpgen);
-return tmpgen;
-}
-
-void Model::makeGeno(Geno &g,MultiMap *map,bool handle_defaults)
-{
-if ((buildstatus!=valid)&&(buildstatus!=building))
-        {
-        g=Geno(0,0,0,"invalid model");
-        return;
-        }
-
-SString gen;
-
-Param modelparam(f0_model_paramtab);
-Param partparam(f0_part_paramtab);
-Param jointparam(f0_joint_paramtab);
-Param neuroparam(f0_neuro_paramtab);
-Param connparam(f0_neuroconn_paramtab);
-
-static Part defaultpart;
-static Joint defaultjoint;
-static Neuro defaultneuro;
-static Model defaultmodel;
-static NeuroConn defaultconn;
-//static NeuroItem defaultneuroitem;
-
-Part *p;
-Joint *j;
-Neuro *n;
-int i;
-int len;
-int a,b;
-//NeuroItem *ni;
-
-SString mod_props;
-modelparam.select(this);
-modelparam.save2(mod_props,handle_defaults ? &defaultmodel : NULL,true,!handle_defaults);
-if (mod_props.len()>1) //are there any non-default values? ("\n" is empty)
-        {
-        gen+="m:";
-        gen+=mod_props;
-        }
-
-for (i=0;p=(Part*)parts(i);i++)
-        {
-        partparam.select(p);
-        len=gen.len();
-        gen+="p:";
-        partparam.save2(gen,handle_defaults ? &defaultpart : NULL,true,!handle_defaults);
-        if (map)
-                map->add(len,gen.len()-1,partToMap(i));
-        }
-for (i=0;j=(Joint*)joints(i);i++)
-        {
-        jointparam.select(j);
-        len=gen.len();
-        jointparam.setParamTab(j->usedelta?f0_joint_paramtab:f0_nodeltajoint_paramtab);
-        gen+="j:";
-        jointparam.save2(gen,handle_defaults ? &defaultjoint : NULL,true,!handle_defaults);
-        if (map)
-                map->add(len,gen.len()-1,jointToMap(i));
-        }
-for (i=0;n=(Neuro*)neurons(i);i++)
-        {
-        neuroparam.select(n);
-        len=gen.len();
-        gen+="n:";
-        neuroparam.save2(gen,handle_defaults ? &defaultneuro : NULL,true,!handle_defaults);
-        if (map)
-                map->add(len,gen.len()-1,neuroToMap(i));
-        }
-for (a=0;a<neurons.size();a++)
+        Geno tmpgen;
+        makeGeno(tmpgen);
+        return tmpgen;
+}
+
+void Model::makeGeno(Geno &g, MultiMap *map, bool handle_defaults)
+{
+        if ((buildstatus != valid) && (buildstatus != building))
+        {
+                g = Geno(0, 0, 0, "invalid model");
+                return;
+        }
+
+        SString gen;
+
+        Param modelparam(f0_model_paramtab);
+        Param partparam(f0_part_paramtab);
+        Param jointparam(f0_joint_paramtab);
+        Param neuroparam(f0_neuro_paramtab);
+        Param connparam(f0_neuroconn_paramtab);
+
+        static Part defaultpart;
+        static Joint defaultjoint;
+        static Neuro defaultneuro;
+        static Model defaultmodel;
+        static NeuroConn defaultconn;
+        //static NeuroItem defaultneuroitem;
+
+        Part *p;
+        Joint *j;
+        Neuro *n;
+        int i;
+        int len;
+        int a, b;
+        //NeuroItem *ni;
+
+        SString mod_props;
+        modelparam.select(this);
+        modelparam.save2(mod_props, handle_defaults ? &defaultmodel : NULL, true, !handle_defaults);
+        if (mod_props.len() > 1) //are there any non-default values? ("\n" is empty)
+        {
+                gen += "m:";
+                gen += mod_props;
+        }
+
+        for (i = 0; p = (Part*)parts(i); i++)
+        {
+                partparam.select(p);
+                len = gen.len();
+                gen += "p:";
+                partparam.save2(gen, handle_defaults ? &defaultpart : NULL, true, !handle_defaults);
+                if (map)
+                        map->add(len, gen.len() - 1, partToMap(i));
+        }
+        for (i = 0; j = (Joint*)joints(i); i++)
+        {
+                jointparam.select(j);
+                len = gen.len();
+                jointparam.setParamTab(j->usedelta ? f0_joint_paramtab : f0_nodeltajoint_paramtab);
+                gen += "j:";
+                jointparam.save2(gen, handle_defaults ? &defaultjoint : NULL, true, !handle_defaults);
+                if (map)
+                        map->add(len, gen.len() - 1, jointToMap(i));
+        }
+        for (i = 0; n = (Neuro*)neurons(i); i++)
+        {
+                neuroparam.select(n);
+                len = gen.len();
+                gen += "n:";
+                neuroparam.save2(gen, handle_defaults ? &defaultneuro : NULL, true, !handle_defaults);
+                if (map)
+                        map->add(len, gen.len() - 1, neuroToMap(i));
+        }
+        for (a = 0; a < neurons.size(); a++)
         { // inputs
-        n=(Neuro*)neurons(a);
-//      if ((n->getInputCount()==1)&&(n->getInput(0).refno <= n->refno))
-//              continue; // already done with Neuro::conn_refno
-
-        for (b=0;b<n->getInputCount();b++)
-                {
-                double w;
-                NeuroConn nc;
-                Neuro* n2=n->getInput(b,w);
-//              if (((n2.parentcount==1)&&(n2.parent)&&(n2.parent->refno < n2.refno)) ^ 
-//                  (n2.neuro_refno>=0))
-//                      printf("!!!! bad Neuro::neuro_refno ?!\n");
-
-//              if ((n2.parentcount==1)&&(n2.parent)&&(n2.parent->refno < n2.refno))
-//              if (n2.neuro_refno>=0)
-//                      continue; // already done with Neuro::neuro_refno
-
-                nc.n1_refno=n->refno; nc.n2_refno=n2->refno;
-                nc.weight=w;
-                SString **s=n->inputInfo(b);
-                if ((s)&&(*s))
-                nc.info=**s;
-                connparam.select(&nc);
-                len=gen.len();
-                gen+="c:";
-                connparam.save2(gen,handle_defaults ? &defaultconn : NULL,true,!handle_defaults);
-                if (map)
-                        map->add(len,gen.len()-1,neuroToMap(n->refno));
-                }
-        }
-g=Geno(gen.c_str(),'0');
+                n = (Neuro*)neurons(a);
+                //      if ((n->getInputCount()==1)&&(n->getInput(0).refno <= n->refno))
+                //              continue; // already done with Neuro::conn_refno
+
+                for (b = 0; b < n->getInputCount(); b++)
+                {
+                        double w;
+                        NeuroConn nc;
+                        Neuro* n2 = n->getInput(b, w);
+                        //              if (((n2.parentcount==1)&&(n2.parent)&&(n2.parent->refno < n2.refno)) ^ 
+                        //                  (n2.neuro_refno>=0))
+                        //                      printf("!!!! bad Neuro::neuro_refno ?!\n");
+
+                        //              if ((n2.parentcount==1)&&(n2.parent)&&(n2.parent->refno < n2.refno))
+                        //              if (n2.neuro_refno>=0)
+                        //                      continue; // already done with Neuro::neuro_refno
+
+                        nc.n1_refno = n->refno; nc.n2_refno = n2->refno;
+                        nc.weight = w;
+                        SString **s = n->inputInfo(b);
+                        if ((s) && (*s))
+                                nc.info = **s;
+                        connparam.select(&nc);
+                        len = gen.len();
+                        gen += "c:";
+                        connparam.save2(gen, handle_defaults ? &defaultconn : NULL, true, !handle_defaults);
+                        if (map)
+                                map->add(len, gen.len() - 1, neuroToMap(n->refno));
+                }
+        }
+        g = Geno(gen.c_str(), '0');
 }
 
@@ -477 +481 @@
 void Model::open()
 {
-if (buildstatus==building) return;
-buildstatus=building;
-modelfromgenotype=0;
-partmappingchanged=0;
-f0genoknown=0;
-delMap();
+        if (buildstatus == building) return;
+        buildstatus = building;
+        modelfromgenotype = 0;
+        partmappingchanged = 0;
+        f0genoknown = 0;
+        delMap();
 }
 
@@ -490 +494 @@
 void Model::setGeno(const Geno& newgeno)
 {
-geno=newgeno;
+        geno = newgeno;
 }
 
 void Model::clearMap()
 {
-Part *p; Joint *j; Neuro *n;
-int i;
-delMap();
-delF0Map();
-for (i=0;p=(Part*)parts(i);i++)
-        p->clearMapping();
-for (i=0;j=(Joint*)joints(i);i++)
-        j->clearMapping();
-for (i=0;n=(Neuro*)neurons(i);i++)
-        n->clearMapping();
+        Part *p; Joint *j; Neuro *n;
+        int i;
+        delMap();
+        delF0Map();
+        for (i = 0; p = (Part*)parts(i); i++)
+                p->clearMapping();
+        for (i = 0; j = (Joint*)joints(i); i++)
+                j->clearMapping();
+        for (i = 0; n = (Neuro*)neurons(i); i++)
+                n->clearMapping();
 }
 
 int Model::close()
 {
-if (buildstatus!=building)
-        logPrintf("Model","close",LOG_WARN,"Unexpected close() - no open()");
-if (internalcheck(1)>0)
-        {
-        buildstatus=valid;
-
-        if (partmappingchanged)
-                {
-                getMap();
-                Part *p; Joint *j; Neuro *n;
-                int i;
-                for (i=0;p=(Part*)parts(i);i++)
-                        if (p->getMapping())
-                                map->add(*p->getMapping(),partToMap(i));
-                for (i=0;j=(Joint*)joints(i);i++)
-                        if (j->getMapping())
-                                map->add(*j->getMapping(),jointToMap(i));
-                for (i=0;n=(Neuro*)neurons(i);i++)
-                        if (n->getMapping())
-                                map->add(*n->getMapping(),neuroToMap(i));
-                }
-        }
-else 
-        buildstatus=invalid;
-
-return (buildstatus==valid);
+        if (buildstatus != building)
+                logPrintf("Model", "close", LOG_WARN, "Unexpected close() - no open()");
+        if (internalcheck(1) > 0)
+        {
+                buildstatus = valid;
+
+                if (partmappingchanged)
+                {
+                        getMap();
+                        Part *p; Joint *j; Neuro *n;
+                        int i;
+                        for (i = 0; p = (Part*)parts(i); i++)
+                                if (p->getMapping())
+                                        map->add(*p->getMapping(), partToMap(i));
+                        for (i = 0; j = (Joint*)joints(i); i++)
+                                if (j->getMapping())
+                                        map->add(*j->getMapping(), jointToMap(i));
+                        for (i = 0; n = (Neuro*)neurons(i); i++)
+                                if (n->getMapping())
+                                        map->add(*n->getMapping(), neuroToMap(i));
+                }
+        }
+        else
+                buildstatus = invalid;
+
+        return (buildstatus == valid);
 }
 
 int Model::validate()
 {
-return internalcheck(0);
-}
-
-Pt3D Model::whereDelta(const Part& start,const Pt3D& rot, const Pt3D& delta)
-{
-Orient roto;
-roto=rot;
-Orient o;
-roto.transform(o,start.o);
-//o.x=start.o/roto.x;
-//o.y=start.o/roto.y;
-//o.z=start.o/roto.z;
-return o.transform(delta)+start.p;
-}
-
-int Model::singleStepBuild(const SString &singleline,const MultiRange* srcrange)
-{
-return singleStepBuild(singleline,0,srcrange);
-}
-
-int Model::singleStepBuild(const SString &singleline,int line_num,const MultiRange* srcrange)
-{
-SString error_message;
-int result=singleStepBuildNoLog(singleline,error_message,srcrange);
-if (result<0)
-        {
-        if (error_message.len()==0) // generic error when no detailed message is available
-                error_message="Invalid f0 code";
-        if (line_num>0)
-                error_message+=SString::sprintf(", line #%d",line_num);
-        error_message+=nameForErrors();
-        logPrintf("Model","build",LOG_ERROR,"%s",error_message.c_str());
-        }
-return result;
-}
-
-int Model::singleStepBuildNoLog(const SString &line,SString& error_message,const MultiRange* srcrange)
-{
-error_message=SString::empty();
-int pos=0; const char*t=line.c_str();
-for (;*t;t++,pos++)
-        if (!strchr(" \r\t",*t)) break;
-if (*t=='#') return 0;
-if (!*t) return 0;
-if (!strncmp(t,"p:",2))
-        {
-        Param partparam(f0_part_paramtab);
-        Part *p=new Part();
-        partparam.select(p);
-        pos+=2;
-        if (partparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) {delete p; error_message="Invalid 'p:'"; return -1;}
-        p->o.rotate(p->rot);
-        parts+=p;
-        p->owner=this;
-        if (srcrange) p->setMapping(*srcrange);
-        return getPartCount()-1;
-        }
-if (!strncmp(t,"m:",2))
-        {
-        Param modelparam(f0_model_paramtab);
-        modelparam.select(this);
-        pos+=2;
-        if (modelparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) { error_message="Invalid 'm:'"; return -1;}
-        return 0;
-        }
-else if (!strncmp(t,"j:",2))
-        {
-        Param jointparam(f0_joint_paramtab);
-        Joint *j=new Joint();
-        jointparam.select(j);
-        pos+=2;
-        j->owner=this;
-        if (jointparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) {delete j; error_message="Invalid 'j:'"; return -1;}
-        bool p1_ok=false, p2_ok=false;
-        if ((p1_ok=((j->p1_refno>=0)&&(j->p1_refno<getPartCount())))&&
-            (p2_ok=((j->p2_refno>=0)&&(j->p2_refno<getPartCount()))))
-                {
-                addJoint(j);
-                if ((j->d.x != JOINT_DELTA_MARKER) || (j->d.y != JOINT_DELTA_MARKER) || (j->d.z != JOINT_DELTA_MARKER))
+        return internalcheck(0);
+}
+
+Pt3D Model::whereDelta(const Part& start, const Pt3D& rot, const Pt3D& delta)
+{
+        Orient roto;
+        roto = rot;
+        Orient o;
+        roto.transform(o, start.o);
+        //o.x=start.o/roto.x;
+        //o.y=start.o/roto.y;
+        //o.z=start.o/roto.z;
+        return o.transform(delta) + start.p;
+}
+
+int Model::singleStepBuild(const SString &singleline, const MultiRange* srcrange)
+{
+        return singleStepBuild(singleline, 0, srcrange);
+}
+
+int Model::singleStepBuild(const SString &singleline, int line_num, const MultiRange* srcrange)
+{
+        SString error_message;
+        int result = singleStepBuildNoLog(singleline, error_message, srcrange);
+        if (result < 0)
+        {
+                if (error_message.len() == 0) // generic error when no detailed message is available
+                        error_message = "Invalid f0 code";
+                if (line_num>0)
+                        error_message += SString::sprintf(", line #%d", line_num);
+                error_message += nameForErrors();
+                logPrintf("Model", "build", LOG_ERROR, "%s", error_message.c_str());
+        }
+        return result;
+}
+
+int Model::singleStepBuildNoLog(const SString &line, SString& error_message, const MultiRange* srcrange)
+{
+        error_message = SString::empty();
+        int pos = 0; const char*t = line.c_str();
+        for (; *t; t++, pos++)
+                if (!strchr(" \r\t", *t)) break;
+        if (*t == '#') return 0;
+        if (!*t) return 0;
+        if (!strncmp(t, "p:", 2))
+        {
+                Param partparam(f0_part_paramtab);
+                Part *p = new Part();
+                partparam.select(p);
+                pos += 2;
+                if (partparam.load2(line, pos) & ParamInterface::LOAD2_PARSE_FAILED) { delete p; error_message = "Invalid 'p:'"; return -1; }
+                p->o.rotate(p->rot);
+                parts += p;
+                p->owner = this;
+                if (srcrange) p->setMapping(*srcrange);
+                return getPartCount() - 1;
+        }
+        if (!strncmp(t, "m:", 2))
+        {
+                Param modelparam(f0_model_paramtab);
+                modelparam.select(this);
+                pos += 2;
+                if (modelparam.load2(line, pos) & ParamInterface::LOAD2_PARSE_FAILED) { error_message = "Invalid 'm:'"; return -1; }
+                return 0;
+        }
+        else if (!strncmp(t, "j:", 2))
+        {
+                Param jointparam(f0_joint_paramtab);
+                Joint *j = new Joint();
+                jointparam.select(j);
+                pos += 2;
+                j->owner = this;
+                if (jointparam.load2(line, pos) & ParamInterface::LOAD2_PARSE_FAILED) { delete j; error_message = "Invalid 'j:'"; return -1; }
+                bool p1_ok = false, p2_ok = false;
+                if ((p1_ok = ((j->p1_refno >= 0) && (j->p1_refno < getPartCount()))) &&
+                        (p2_ok = ((j->p2_refno >= 0) && (j->p2_refno < getPartCount()))))
+                {
+                        addJoint(j);
+                        if ((j->d.x != JOINT_DELTA_MARKER) || (j->d.y != JOINT_DELTA_MARKER) || (j->d.z != JOINT_DELTA_MARKER))
                         {
-                        j->useDelta(1);
-                        j->resetDeltaMarkers();
+                                j->useDelta(1);
+                                j->resetDeltaMarkers();
                         }
-                j->attachToParts(j->p1_refno,j->p2_refno);
-                if (srcrange) j->setMapping(*srcrange);
-                return j->refno;
-                }
-        else
-                {
-                error_message=SString::sprintf("Invalid reference to Part #%d",p1_ok?j->p1_refno:j->p2_refno);
-                delete j;
-                return -1;
-                }
-        }
-else if (!strncmp(t,"n:",2)) // neuro (or the old neuro object as the special case)
-        {
-        Param neuroparam(f0_neuro_paramtab);
-        Neuro *nu=new Neuro();
-        neuroparam.select(nu);
-        pos+=2;
-        if (neuroparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) {delete nu; error_message="Invalid 'n:'"; return -1;}
+                        j->attachToParts(j->p1_refno, j->p2_refno);
+                        if (srcrange) j->setMapping(*srcrange);
+                        return j->refno;
+                }
+                else
+                {
+                        error_message = SString::sprintf("Invalid reference to Part #%d", p1_ok ? j->p1_refno : j->p2_refno);
+                        delete j;
+                        return -1;
+                }
+        }
+        else if (!strncmp(t, "n:", 2)) // neuro (or the old neuro object as the special case)
+        {
+                Param neuroparam(f0_neuro_paramtab);
+                Neuro *nu = new Neuro();
+                neuroparam.select(nu);
+                pos += 2;
+                if (neuroparam.load2(line, pos) & ParamInterface::LOAD2_PARSE_FAILED) { delete nu; error_message = "Invalid 'n:'"; return -1; }
 #ifdef MODEL_V1_COMPATIBLE
-        if (nu->neuro_refno>=0) // parent specified...
-                {
-                if (nu->neuro_refno >= getNeuroCount()) // and it's illegal
+                if (nu->neuro_refno>=0) // parent specified...
+                {
+                        if (nu->neuro_refno >= getNeuroCount()) // and it's illegal
+                        {
+                                delete nu;
+                                return -1;
+                        }
+                        Neuro *parentNU=getNeuro(nu->neuro_refno);
+                        parentNU->addInput(nu,nu->weight);
+                        // default class for parented units: n-n link
+                        //if (nu->moredata.len()==0) nu->moredata="-";
+                }
+                else
+#endif
+                {
+                        // default class for unparented units: standard neuron
+                        if (nu->getClassName().len() == 0) nu->setClassName("N");
+                }
+                /*
+                        if (nu->conn_refno>=0) // input specified...
+                        {
+                        if (nu->conn_refno >= getNeuroCount()) // and it's illegal
                         {
                         delete nu;
                         return -1;
                         }
-                Neuro *parentNU=getNeuro(nu->neuro_refno);
-                parentNU->addInput(nu,nu->weight);
-                // default class for parented units: n-n link
-                //if (nu->moredata.len()==0) nu->moredata="-";
-                }
-        else
+                        Neuro *inputNU=getNeuro(nu->conn_refno);
+                        nu->addInput(inputNU,nu->weight);
+                        }
+                        */
+#ifdef MODEL_V1_COMPATIBLE
+                nu->weight=1.0;
 #endif
-                {
-                // default class for unparented units: standard neuron
-                if (nu->getClassName().len()==0) nu->setClassName("N");
-                }
-/*
-        if (nu->conn_refno>=0) // input specified...
-                {
-                if (nu->conn_refno >= getNeuroCount()) // and it's illegal
-                        {
+                nu->owner = this;
+                // attach to part/joint
+                if (nu->part_refno >= 0)
+                        nu->attachToPart(nu->part_refno);
+                if (nu->joint_refno >= 0)
+                        nu->attachToJoint(nu->joint_refno);
+                if (srcrange) nu->setMapping(*srcrange);
+                // todo: check part/joint ref# 
+#ifdef MODEL_V1_COMPATIBLE
+                if (hasOldNeuroLayout())
+                {
+                        int count=old_getNeuroCount();
+                        neurons.insert(count,nu);
+                        oldneurocount=count+1;
+                        return oldneurocount-1;
+                }
+                else
+#endif
+                {
+                        neurons += nu;
+                        return neurons.size() - 1;
+                }
+        }
+        else if (!strncmp(t, "c:", 2)) // add input
+        {
+                Param ncparam(f0_neuroconn_paramtab);
+                NeuroConn c;
+                ncparam.select(&c);
+                pos += 2;
+                if (ncparam.load2(line, pos) & ParamInterface::LOAD2_PARSE_FAILED) { error_message = "Invalid 'c:'"; return -1; }
+                bool n1_ok = false, n2_ok = false;
+                if ((n1_ok = ((c.n1_refno >= 0) && (c.n1_refno < getNeuroCount())))
+                        && (n2_ok = ((c.n2_refno >= 0) && (c.n2_refno < getNeuroCount()))))
+                {
+                        Neuro *na = getNeuro(c.n1_refno);
+                        Neuro *nb = getNeuro(c.n2_refno);
+                        na->addInput(nb, c.weight, &c.info);
+                        if (srcrange)
+                                na->addMapping(*srcrange);
+                        return 0;
+                }
+                error_message = SString::sprintf("Invalid reference to Neuro #%d", n1_ok ? c.n2_refno : c.n1_refno);
+                return -1;
+        }
+#ifdef MODEL_V1_COMPATIBLE
+        else if (!strncmp(t,"ni:",3)) // old neuroitem
+        {
+                // we always use old layout for "ni:"
+                Param neuroitemparam(f0_neuroitem_paramtab);
+                Neuro *nu=new Neuro();
+                neuroitemparam.select(nu);
+                pos+=3;
+                if (neuroitemparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) {delete nu; return -1;}
+                // illegal parent?
+                if ((nu->neuro_refno<0)||(nu->neuro_refno>=old_getNeuroCount()))
+                {
                         delete nu;
                         return -1;
-                        }
-                Neuro *inputNU=getNeuro(nu->conn_refno);
-                nu->addInput(inputNU,nu->weight);
-                }
-*/
-#ifdef MODEL_V1_COMPATIBLE
-        nu->weight=1.0;
+                }
+                Neuro *parentN=getNeuro(nu->neuro_refno);
+                // copy part/joint refno from parent, if possible
+                if ((nu->part_refno<0)&&(parentN->part_refno>=0))
+                        nu->part_refno=parentN->part_refno;
+                if ((nu->joint_refno<0)&&(parentN->joint_refno>=0))
+                        nu->joint_refno=parentN->joint_refno;
+                nu->owner=this;
+                // attach to part/joint
+                if (nu->part_refno>=0)
+                        nu->attachToPart(nu->part_refno);
+                if (nu->joint_refno>=0)
+                        nu->attachToJoint(nu->joint_refno);
+                if (srcrange)
+                        nu->setMapping(*srcrange);
+                // special case: old muscles
+                // PARENT neuron will be set up to be the CHILD of the current one (!)
+                if (nu->isOldEffector())
+                {
+                        nu->neuro_refno=parentN->refno;
+                        neurons+=nu;
+                        nu->owner=this;
+                        nu->addInput(parentN,nu->weight); // (!)
+                        nu->weight=1.0;
+                        parentN->invalidateOldItems();
+                        return 0; // !!! -> ...getItemCount()-1;
+                }
+                parentN->addInput(nu,nu->weight);
+                neurons+=nu;
+                parentN->invalidateOldItems();
+                if (nu->getClassName().len()==0)
+                {
+                        nu->setClassName("-");
+                        // for compatibility, "ni" can define a n-n connection
+                        // referring to non-existent neuron (which will be hopefully defined later)
+                        // internal check will add the proper input to this unit
+                        // if conn_refno >=0 and input count==0
+                        oldconnections=1;
+                        if (srcrange)
+                                parentN->addMapping(*srcrange);
+                }
+                else
+                        nu->weight=1.0;
+                return 0; // !!! -> ...getItemCount()-1;
+        }
 #endif
-        nu->owner=this;
-        // attach to part/joint
-        if (nu->part_refno>=0)
-                nu->attachToPart(nu->part_refno);
-        if (nu->joint_refno>=0)
-                nu->attachToJoint(nu->joint_refno);
-        if (srcrange) nu->setMapping(*srcrange);
-        // todo: check part/joint ref# 
-#ifdef MODEL_V1_COMPATIBLE
-        if (hasOldNeuroLayout())
-                {
-                int count=old_getNeuroCount();
-                neurons.insert(count,nu);
-                oldneurocount=count+1;
-                return oldneurocount-1;
-                }
-        else
-#endif
-                {
-                neurons+=nu;
-                return neurons.size()-1;
-                }
-        }
-else if (!strncmp(t,"c:",2)) // add input
-        {
-        Param ncparam(f0_neuroconn_paramtab);
-        NeuroConn c;
-        ncparam.select(&c);
-        pos+=2;
-        if (ncparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) { error_message="Invalid 'c:'"; return -1; }
-        bool n1_ok=false,n2_ok=false;
-        if ((n1_ok=((c.n1_refno>=0)&&(c.n1_refno<getNeuroCount())))
-            && (n2_ok=((c.n2_refno>=0)&&(c.n2_refno<getNeuroCount()))))
-                {
-                Neuro *na=getNeuro(c.n1_refno);
-                Neuro *nb=getNeuro(c.n2_refno);
-                na->addInput(nb,c.weight,&c.info);
-                if (srcrange)
-                        na->addMapping(*srcrange);
-                return 0;
-                }
-        error_message=SString::sprintf("Invalid reference to Neuro #%d",n1_ok ? c.n2_refno : c.n1_refno);
-        return -1;
-        }
-#ifdef MODEL_V1_COMPATIBLE
-else if (!strncmp(t,"ni:",3)) // old neuroitem
-        {
-        // we always use old layout for "ni:"
-        Param neuroitemparam(f0_neuroitem_paramtab);
-        Neuro *nu=new Neuro();
-        neuroitemparam.select(nu);
-        pos+=3;
-        if (neuroitemparam.load2(line,pos) & ParamInterface::LOAD2_PARSE_FAILED) {delete nu; return -1;}
-        // illegal parent?
-        if ((nu->neuro_refno<0)||(nu->neuro_refno>=old_getNeuroCount()))
-                {
-                delete nu;
-                return -1;
-                }
-        Neuro *parentN=getNeuro(nu->neuro_refno);
-        // copy part/joint refno from parent, if possible
-        if ((nu->part_refno<0)&&(parentN->part_refno>=0))
-                nu->part_refno=parentN->part_refno;
-        if ((nu->joint_refno<0)&&(parentN->joint_refno>=0))
-                nu->joint_refno=parentN->joint_refno;
-        nu->owner=this;
-        // attach to part/joint
-        if (nu->part_refno>=0)
-                nu->attachToPart(nu->part_refno);
-        if (nu->joint_refno>=0)
-                nu->attachToJoint(nu->joint_refno);
-        if (srcrange)
-                nu->setMapping(*srcrange);
-        // special case: old muscles
-        // PARENT neuron will be set up to be the CHILD of the current one (!)
-        if (nu->isOldEffector())
-                {
-                nu->neuro_refno=parentN->refno;
-                neurons+=nu;
-                nu->owner=this;
-                nu->addInput(parentN,nu->weight); // (!)
-                nu->weight=1.0;
-                parentN->invalidateOldItems();
-                return 0; // !!! -> ...getItemCount()-1;
-                }
-        parentN->addInput(nu,nu->weight);
-        neurons+=nu;
-        parentN->invalidateOldItems();
-        if (nu->getClassName().len()==0)
-                {
-                nu->setClassName("-");
-                // for compatibility, "ni" can define a n-n connection
-                // referring to non-existent neuron (which will be hopefully defined later)
-                // internal check will add the proper input to this unit
-                // if conn_refno >=0 and input count==0
-                oldconnections=1;
-                if (srcrange)
-                        parentN->addMapping(*srcrange);
-                }
-        else
-                nu->weight=1.0;
-        return 0; // !!! -> ...getItemCount()-1;
-        }
-#endif
-else return -1;
+        else return -1;
 }
 
@@ -784 +788 @@
 int Model::addOldConnectionsInputs()
 {
-if (!oldconnections) return 1;
-Neuro* n;
-for (int i=0;i<neurons.size();i++)
-        {
-        n=(Neuro*)neurons(i);
-        if (n->conn_refno>=0)
-                if (n->isNNConnection())
-                        if (n->conn_refno < old_getNeuroCount())
+        if (!oldconnections) return 1;
+        Neuro* n;
+        for (int i=0;i<neurons.size();i++)
+        {
+                n=(Neuro*)neurons(i);
+                if (n->conn_refno>=0)
+                        if (n->isNNConnection())
+                                if (n->conn_refno < old_getNeuroCount())
                                 { // good reference
-                                Neuro* parent=n->parent; // nn connection has exactly one parent
-                                int inp=parent->findInput(n);
-                                Neuro* target=getNeuro(n->conn_refno);
-                                parent->setInput(inp,target,n->weight);
-                                removeNeuro(i,0); // no need to remove references
-                                i--;
+                        Neuro* parent=n->parent; // nn connection has exactly one parent
+                        int inp=parent->findInput(n);
+                        Neuro* target=getNeuro(n->conn_refno);
+                        parent->setInput(inp,target,n->weight);
+                        removeNeuro(i,0); // no need to remove references
+                        i--;
                                 }
+                                else
+                                {
+                                        logPrintf("Model","internalCheck",LOG_ERROR,
+                                                "illegal N-N connection #%d (reference to #%d)%s",
+                                                i,n->conn_refno,nameForErrors().c_str());
+                                        return 0;
+                                }
+        }
+        oldconnections=0;
+        return 1;
+}
+#endif
+
+/////////////
+
+/** change the sequence of neuro units
+        and fix references in "-" objects (n-n connections)  */
+void Model::moveNeuro(int oldpos, int newpos)
+{
+        if (oldpos == newpos) return; // nop!
+        Neuro *n = getNeuro(oldpos);
+        neurons -= oldpos;
+        neurons.insert(newpos, n);
+        // conn_refno could be broken -> fix it
+#ifdef MODEL_V1_COMPATIBLE
+        for (int i=0;i<neurons.size();i++)
+        {
+                Neuro *n2=getNeuro(i);
+                if (n2->isNNConnection())
+                        if (n2->conn_refno == oldpos) n2->conn_refno=newpos;
                         else
-                                {
-                                logPrintf("Model","internalCheck",LOG_ERROR,
-                                         "illegal N-N connection #%d (reference to #%d)%s",
-                                          i,n->conn_refno,nameForErrors().c_str());
-                                return 0;
-                                }
-        }
-oldconnections=0;
-return 1;
-}
-#endif
-
-/////////////
-
-/** change the sequence of neuro units 
-    and fix references in "-" objects (n-n connections)  */
-void Model::moveNeuro(int oldpos,int newpos)
-{
-if (oldpos==newpos) return; // nop!
-Neuro *n=getNeuro(oldpos);
-neurons-=oldpos;
-neurons.insert(newpos,n);
- // conn_refno could be broken -> fix it
-#ifdef MODEL_V1_COMPATIBLE
-for (int i=0;i<neurons.size();i++)
-        {
-        Neuro *n2=getNeuro(i);
-        if (n2->isNNConnection())
-                if (n2->conn_refno == oldpos) n2->conn_refno=newpos;
-                else
-                { if (n2->conn_refno > oldpos) n2->conn_refno--;
-                  if (n2->conn_refno >= newpos) n2->conn_refno++; }
-        }
-invalidateOldNeuroCount();
+                        { if (n2->conn_refno > oldpos) n2->conn_refno--;
+                if (n2->conn_refno >= newpos) n2->conn_refno++; }
+        }
+        invalidateOldNeuroCount();
 #endif
 }
@@ -840 +844 @@
 #ifdef MODEL_V1_COMPATIBLE
 /** move all old neurons (class "N") to the front of the neurons list.
-    @return number of old neurons
-  */
+        @return number of old neurons
+        */
 int Model::reorderToOldLayout()
 {
-Neuro *n;
-int neurocount=0;
-for (int i=0;i<neurons.size();i++)
-        {
-        n=(Neuro*)neurons(i);
-        if (n->isOldNeuron())
-                {
-                moveNeuro(i,neurocount);
-                neurocount++;
-                i=neurocount-1;
-                }
-        }
-return neurocount;
+        Neuro *n;
+        int neurocount=0;
+        for (int i=0;i<neurons.size();i++)
+        {
+                n=(Neuro*)neurons(i);
+                if (n->isOldNeuron())
+                {
+                        moveNeuro(i,neurocount);
+                        neurocount++;
+                        i=neurocount-1;
+                }
+        }
+        return neurocount;
 }
 #endif
@@ -863 +867 @@
 void Model::updateNeuroRefno()
 {
-for (int i=0;i<neurons.size();i++)
-        {
-        Neuro* n=(Neuro*)neurons(i);
-        n->refno=i;
+        for (int i = 0; i < neurons.size(); i++)
+        {
+                Neuro* n = (Neuro*)neurons(i);
+                n->refno = i;
         }
 }
@@ -882 +886 @@
 void Model::updateRefno()
 {
-int i;
-for (i=0;i<getPartCount();i++) getPart(i)->refno=i;
-for (i=0;i<getJointCount();i++) getJoint(i)->refno=i;
-for (i=0;i<getNeuroCount();i++) getNeuro(i)->refno=i;
+        int i;
+        for (i = 0; i < getPartCount(); i++) getPart(i)->refno = i;
+        for (i = 0; i < getJointCount(); i++) getJoint(i)->refno = i;
+        for (i = 0; i < getNeuroCount(); i++) getNeuro(i)->refno = i;
 }
 
 SString Model::nameForErrors() const
 {
-if (geno.getName().len()>0)
-        return SString::sprintf(" in '%s'",geno.getName().c_str());
-return SString::empty();
+        if (geno.getName().len()>0)
+                return SString::sprintf(" in '%s'", geno.getName().c_str());
+        return SString::empty();
 }
 
 int Model::internalcheck(int final)
 {
-Part *p;
-Joint *j;
-Neuro *n;
-int i,k;
-int ret=1;
-shape=SHAPE_UNKNOWN;
-if ((parts.size()==0)&&(neurons.size()==0)) return 0;
-if (parts.size()==0)
-        size=Pt3D_0;
-else
-        {
-Pt3D bbmin=((Part*)parts(0))->p, bbmax=bbmin;
-for (i=0;i<parts.size();i++)
-        {
-        p=(Part*)parts(i);
-        p->owner=this;
-        p->refno=i;
-        if (p->shape==0)
-                {
-                if (checklevel>0)
-                        p->mass=0.0;
-                }
-//      VALIDMINMAX(p,part,mass);
-        VALIDMINMAX(p,Part,size);
-        VALIDMINMAX(p,Part,density);
-        VALIDMINMAX(p,Part,friction);
-        VALIDMINMAX(p,Part,ingest);
-        VALIDMINMAX(p,Part,assim);
-        p->flags&=~LINKFLAG; // for delta joint cycle detection
-        if (p->p.x-p->size < bbmin.x) bbmin.x=p->p.x-p->size;
-        if (p->p.y-p->size < bbmin.y) bbmin.y=p->p.y-p->size;
-        if (p->p.z-p->size < bbmin.z) bbmin.z=p->p.z-p->size;
-        if (p->p.x+p->size > bbmax.x) bbmax.x=p->p.x+p->size;
-        if (p->p.y+p->size > bbmax.y) bbmax.y=p->p.y+p->size;
-        if (p->p.z+p->size > bbmax.z) bbmax.z=p->p.z+p->size;
-        if (shape==SHAPE_UNKNOWN)
-                shape=(p->shape==Part::SHAPE_DEFAULT)?SHAPE_OLD:SHAPE_NEW;
-        else if (shape!=SHAPE_ILLEGAL)
-                {
-                if ((p->shape==Part::SHAPE_DEFAULT) ^ (shape==SHAPE_OLD))
+        Part *p;
+        Joint *j;
+        Neuro *n;
+        int i, k;
+        int ret = 1;
+        shape = SHAPE_UNKNOWN;
+        if ((parts.size() == 0) && (neurons.size() == 0)) return 0;
+        if (parts.size() == 0)
+                size = Pt3D_0;
+        else
+        {
+                Pt3D bbmin = ((Part*)parts(0))->p, bbmax = bbmin;
+                for (i = 0; i < parts.size(); i++)
+                {
+                        p = (Part*)parts(i);
+                        p->owner = this;
+                        p->refno = i;
+                        if (p->shape == 0)
                         {
-                        shape=SHAPE_ILLEGAL;
-                        logPrintf("Model","internalCheck",LOG_WARN,"Inconsistent part shapes (mixed old and new shapes)%s",nameForErrors().c_str());
+                                if (checklevel > 0)
+                                        p->mass = 0.0;
                         }
-                }
-        }
-size=bbmax-bbmin;
-for (i=0;i<joints.size();i++)
-        {
-        j=(Joint*)joints(i);
-        VALIDMINMAX(j,Joint,stamina);
-        VALIDMINMAX(j,Joint,stif);
-        VALIDMINMAX(j,Joint,rotstif);
-        j->refno=i;
-        j->owner=this;
-        if (j->part1 && j->part2 && (j->part1 != j->part2))
-                {
-                j->p1_refno=j->part1->refno;
-                j->p2_refno=j->part2->refno;
-                if (checklevel>0)
+                        //      VALIDMINMAX(p,part,mass);
+                        VALIDMINMAX(p, Part, size);
+                        VALIDMINMAX(p, Part, density);
+                        VALIDMINMAX(p, Part, friction);
+                        VALIDMINMAX(p, Part, ingest);
+                        VALIDMINMAX(p, Part, assim);
+                        p->flags &= ~LINKFLAG; // for delta joint cycle detection
+                        if (p->p.x - p->size < bbmin.x) bbmin.x = p->p.x - p->size;
+                        if (p->p.y - p->size < bbmin.y) bbmin.y = p->p.y - p->size;
+                        if (p->p.z - p->size < bbmin.z) bbmin.z = p->p.z - p->size;
+                        if (p->p.x + p->size > bbmax.x) bbmax.x = p->p.x + p->size;
+                        if (p->p.y + p->size > bbmax.y) bbmax.y = p->p.y + p->size;
+                        if (p->p.z + p->size > bbmax.z) bbmax.z = p->p.z + p->size;
+                        if (shape == SHAPE_UNKNOWN)
+                                shape = (p->shape == Part::SHAPE_DEFAULT) ? SHAPE_OLD : SHAPE_NEW;
+                        else if (shape != SHAPE_ILLEGAL)
                         {
-                        if (j->part1->shape==0)
-                                j->part1->mass+=1.0;
-                        if (j->part2->shape==0)
-                                j->part2->mass+=1.0;
-                        }
-                if ((j->usedelta)&&((j->d.x!=JOINT_DELTA_MARKER)||(j->d.y!=JOINT_DELTA_MARKER)||(j->d.z!=JOINT_DELTA_MARKER)))
-                        { // delta positioning -> calc. orient.
-                        if (j->part2->flags & LINKFLAG)
+                                if ((p->shape == Part::SHAPE_DEFAULT) ^ (shape == SHAPE_OLD))
                                 {
-                                ret=0;
-                                logPrintf("Model","internalCheck",LOG_ERROR,
-                                         "Delta joint cycle detected at Joint #%d%s",
-                                         i,nameForErrors().c_str());
-                                }
-                        j->resetDeltaMarkers();
-                        j->o=j->rot;
-                        j->part1->o.transform(j->part2->o,j->o);
-//                      j->part2->o.x=j->part1->o/j->o.x;
-//                      j->part2->o.y=j->part1->o/j->o.y;
-//                      j->part2->o.z=j->part1->o/j->o.z;
-                        j->part2->p=j->part2->o.transform(j->d)+j->part1->p;
-                        j->part2->flags|=LINKFLAG; j->part1->flags|=LINKFLAG; // for delta joint cycle detection
-                        }
-                else
-                        { // abs.positioning -> calc. delta
-                        if (final)
-                        {
-                        // calc orient delta
-//                      Orient tmpo(j->part2->o);
-//                      tmpo*=j->part1->o;
-                        Orient tmpo;
-                        j->part1->o.revTransform(tmpo,j->part2->o);
-                        tmpo.getAngles(j->rot);
-                        j->o=j->rot;
-                        // calc position delta
-                        Pt3D tmpp(j->part2->p);
-                        tmpp-=j->part1->p;
-                        j->d=j->part2->o.revTransform(tmpp);
-                        }
-                        }
-                if (final)
-                        {
-                        if (j->shape!=Joint::SHAPE_SOLID)
-                                {
-                        if (j->d()>getMaxJoint().d.x)
-                        {
-                        ret=0;
-                        logPrintf("Model","internalCheck",LOG_ERROR,"Joint #%d too long%s",i,nameForErrors().c_str());
-                        }
+                                        shape = SHAPE_ILLEGAL;
+                                        logPrintf("Model", "internalCheck", LOG_WARN, "Inconsistent part shapes (mixed old and new shapes)%s", nameForErrors().c_str());
                                 }
                         }
                 }
-        else
-                {
-                logPrintf("Model","internalCheck",LOG_ERROR,"Illegal part references in Joint #%d%s",i,nameForErrors().c_str());
-                ret=0;
-                }
-        if (shape!=SHAPE_ILLEGAL)
-                {
-                if ((j->shape==Joint::SHAPE_DEFAULT) ^ (shape==SHAPE_OLD))
+                size = bbmax - bbmin;
+                for (i = 0; i < joints.size(); i++)
+                {
+                        j = (Joint*)joints(i);
+                        VALIDMINMAX(j, Joint, stamina);
+                        VALIDMINMAX(j, Joint, stif);
+                        VALIDMINMAX(j, Joint, rotstif);
+                        j->refno = i;
+                        j->owner = this;
+                        if (j->part1 && j->part2 && (j->part1 != j->part2))
                         {
-                        shape=SHAPE_ILLEGAL;
-                        logPrintf("Model","internalCheck",LOG_WARN,"Inconsistent joint shapes (mixed old and new shapes)%s",nameForErrors().c_str());
-                        }
-                }
-        }
-        }
-#ifdef MODEL_V1_COMPATIBLE
-if (!addOldConnectionsInputs())
-        return 0;
-#endif
-
-updateNeuroRefno(); // valid refno is important for n-n connections check (later)
-
-for (i=0;i<neurons.size();i++)
-        {
-        n=(Neuro*)neurons(i);
-        VALIDMINMAX(n,Neuro,state);
-#ifdef MODEL_V1_COMPATIBLE
-        VALIDMINMAX(n,Neuro,inertia);
-        VALIDMINMAX(n,Neuro,force);
-        VALIDMINMAX(n,Neuro,sigmo);
-        n->conn_refno=-1;
-        n->weight=1.0;
-        n->neuro_refno=-1;
-#endif
-        n->part_refno=(n->part)?n->part->refno:-1;
-        n->joint_refno=(n->joint)?n->joint->refno:-1;
-        }
-
-if (parts.size()&&(checklevel>0))
-        {
-        for (i=0;i<parts.size();i++)
-                {
-                p=(Part*)parts(i);
-                if (p->shape==0)
-                        if (p->mass<=0.001)
-                                p->mass=1.0;
-                p->flags&=~LINKFLAG;
-                }
-        getPart(0)->flags|=LINKFLAG;
-        int change=1;
-        while(change)
-                {
-                change=0;
-                for (i=0;i<joints.size();i++)
-                        {
-                        j=(Joint*)joints(i);
-                        if (j->part1->flags&LINKFLAG)
+                                j->p1_refno = j->part1->refno;
+                                j->p2_refno = j->part2->refno;
+                                if (checklevel > 0)
                                 {
-                                if (!(j->part2->flags&LINKFLAG))
+                                        if (j->part1->shape == 0)
+                                                j->part1->mass += 1.0;
+                                        if (j->part2->shape == 0)
+                                                j->part2->mass += 1.0;
+                                }
+                                if ((j->usedelta) && ((j->d.x != JOINT_DELTA_MARKER) || (j->d.y != JOINT_DELTA_MARKER) || (j->d.z != JOINT_DELTA_MARKER)))
+                                { // delta positioning -> calc. orient.
+                                        if (j->part2->flags & LINKFLAG)
                                         {
-                                        change=1;
-                                        j->part2->flags|=LINKFLAG;
+                                                ret = 0;
+                                                logPrintf("Model", "internalCheck", LOG_ERROR,
+                                                        "Delta joint cycle detected at Joint #%d%s",
+                                                        i, nameForErrors().c_str());
+                                        }
+                                        j->resetDeltaMarkers();
+                                        j->o = j->rot;
+                                        j->part1->o.transform(j->part2->o, j->o);
+                                        //                      j->part2->o.x=j->part1->o/j->o.x;
+                                        //                      j->part2->o.y=j->part1->o/j->o.y;
+                                        //                      j->part2->o.z=j->part1->o/j->o.z;
+                                        j->part2->p = j->part2->o.transform(j->d) + j->part1->p;
+                                        j->part2->flags |= LINKFLAG; j->part1->flags |= LINKFLAG; // for delta joint cycle detection
+                                }
+                                else
+                                { // abs.positioning -> calc. delta
+                                        if (final)
+                                        {
+                                                // calc orient delta
+                                                //                      Orient tmpo(j->part2->o);
+                                                //                      tmpo*=j->part1->o;
+                                                Orient tmpo;
+                                                j->part1->o.revTransform(tmpo, j->part2->o);
+                                                tmpo.getAngles(j->rot);
+                                                j->o = j->rot;
+                                                // calc position delta
+                                                Pt3D tmpp(j->part2->p);
+                                                tmpp -= j->part1->p;
+                                                j->d = j->part2->o.revTransform(tmpp);
                                         }
                                 }
-                        else
-                        if (j->part2->flags&LINKFLAG)
+                                if (final)
                                 {
-                                if (!(j->part1->flags&LINKFLAG))
+                                        if (j->shape != Joint::SHAPE_SOLID)
                                         {
-                                        change=1;
-                                        j->part1->flags|=LINKFLAG;
+                                                if (j->d() > getMaxJoint().d.x)
+                                                {
+                                                        ret = 0;
+                                                        logPrintf("Model", "internalCheck", LOG_ERROR, "Joint #%d too long%s", i, nameForErrors().c_str());
+                                                }
                                         }
                                 }
                         }
-                }
-        for (i=0;i<parts.size();i++)
-                {
-                p=(Part*)parts(i);
-                if (!(p->flags&LINKFLAG))
+                        else
                         {
-                        logPrintf("Model","internalCheck",LOG_ERROR,"Not all parts connected (eg. Part #0 and Part #%d)%s",i,nameForErrors().c_str());
-                        ret=0;
+                                logPrintf("Model", "internalCheck", LOG_ERROR, "Illegal part references in Joint #%d%s", i, nameForErrors().c_str());
+                                ret = 0;
+                        }
+                        if (shape != SHAPE_ILLEGAL)
+                        {
+                                if ((j->shape == Joint::SHAPE_DEFAULT) ^ (shape == SHAPE_OLD))
+                                {
+                                        shape = SHAPE_ILLEGAL;
+                                        logPrintf("Model", "internalCheck", LOG_WARN, "Inconsistent joint shapes (mixed old and new shapes)%s", nameForErrors().c_str());
+                                }
+                        }
+                }
+        }
+#ifdef MODEL_V1_COMPATIBLE
+        if (!addOldConnectionsInputs())
+                return 0;
+#endif
+
+        updateNeuroRefno(); // valid refno is important for n-n connections check (later)
+
+        for (i = 0; i < neurons.size(); i++)
+        {
+                n = (Neuro*)neurons(i);
+                VALIDMINMAX(n, Neuro, state);
+#ifdef MODEL_V1_COMPATIBLE
+                VALIDMINMAX(n,Neuro,inertia);
+                VALIDMINMAX(n,Neuro,force);
+                VALIDMINMAX(n,Neuro,sigmo);
+                n->conn_refno=-1;
+                n->weight=1.0;
+                n->neuro_refno=-1;
+#endif
+                n->part_refno = (n->part) ? n->part->refno : -1;
+                n->joint_refno = (n->joint) ? n->joint->refno : -1;
+        }
+
+        if (parts.size() && (checklevel > 0))
+        {
+                for (i = 0; i < parts.size(); i++)
+                {
+                        p = (Part*)parts(i);
+                        if (p->shape == 0)
+                                if (p->mass <= 0.001)
+                                        p->mass = 1.0;
+                        p->flags &= ~LINKFLAG;
+                }
+                getPart(0)->flags |= LINKFLAG;
+                int change = 1;
+                while (change)
+                {
+                        change = 0;
+                        for (i = 0; i < joints.size(); i++)
+                        {
+                                j = (Joint*)joints(i);
+                                if (j->part1->flags&LINKFLAG)
+                                {
+                                        if (!(j->part2->flags&LINKFLAG))
+                                        {
+                                                change = 1;
+                                                j->part2->flags |= LINKFLAG;
+                                        }
+                                }
+                                else
+                                        if (j->part2->flags&LINKFLAG)
+                                        {
+                                        if (!(j->part1->flags&LINKFLAG))
+                                        {
+                                                change = 1;
+                                                j->part1->flags |= LINKFLAG;
+                                        }
+                                        }
+                        }
+                }
+                for (i = 0; i < parts.size(); i++)
+                {
+                        p = (Part*)parts(i);
+                        if (!(p->flags&LINKFLAG))
+                        {
+                                logPrintf("Model", "internalCheck", LOG_ERROR, "Not all parts connected (eg. Part #0 and Part #%d)%s", i, nameForErrors().c_str());
+                                ret = 0;
+                                break;
+                        }
+                }
+        }
+
+        for (i = 0; i < joints.size(); i++)
+        {
+                j = (Joint*)joints(i);
+                if (j->p1_refno == j->p2_refno)
+                {
+                        logPrintf("Model", "internalCheck", LOG_ERROR, "Illegal self connection, Joint #%d%s", i, nameForErrors().c_str());
+                        ret = 0;
                         break;
+                }
+                for (k = i + 1; k < joints.size(); k++)
+                {
+                        Joint* j2 = (Joint*)joints(k);
+                        if (((j->p1_refno == j2->p1_refno) && (j->p2_refno == j2->p2_refno))
+                                || ((j->p1_refno == j2->p2_refno) && (j->p2_refno == j2->p1_refno)))
+                        {
+                                logPrintf("Model", "internalCheck", LOG_ERROR, "Illegal duplicate Joint #%d and Joint #%d%s", i, k, nameForErrors().c_str());
+                                ret = 0;
+                                break;
                         }
                 }
         }
-
-for (i=0;i<joints.size();i++)
-        {
-        j=(Joint*)joints(i);
-        if (j->p1_refno==j->p2_refno)
-                {
-                logPrintf("Model","internalCheck",LOG_ERROR,"Illegal self connection, Joint #%d%s",i,nameForErrors().c_str());
-                ret=0;
-                break;
-                }
-        for (k=i+1;k<joints.size();k++)
-                {
-                Joint* j2=(Joint*)joints(k);
-                if (((j->p1_refno==j2->p1_refno)&&(j->p2_refno==j2->p2_refno))
-                    || ((j->p1_refno==j2->p2_refno)&&(j->p2_refno==j2->p1_refno)))
-                        {
-                        logPrintf("Model","internalCheck",LOG_ERROR,"Illegal duplicate Joint #%d and Joint #%d%s",i,k,nameForErrors().c_str());
-                        ret=0;
-                        break;
-                        }
-                }
-        }
-if (shape==SHAPE_ILLEGAL)
-        ret=0;
-return ret;
+        if (shape == SHAPE_ILLEGAL)
+                ret = 0;
+        return ret;
 }
 
@@ -1127 +1131 @@
 int Model::getErrorPosition(bool includingwarnings)
 {
-return includingwarnings?
-        ((f0errorposition>=0) ? f0errorposition : f0warnposition)
-        :
-        f0errorposition;
+        return includingwarnings ?
+                ((f0errorposition >= 0) ? f0errorposition : f0warnposition)
+                :
+                f0errorposition;
 }
 
 const Geno& Model::getGeno() const
 {
-return geno;
+        return geno;
 }
 
 const Geno Model::getF0Geno()
 {
-if (buildstatus==building)
-        logPrintf("Model","getGeno",LOG_WARN,"Model was not completed - missing close()");
-if (buildstatus!=valid)
-        return Geno("",'0',"","invalid");
-if (!f0genoknown)
-        {
-        if (autobuildmaps)
-                {
-                initF0Map();
-                makeGeno(f0geno,f0map);
-                }
-        else
-                {
-                delF0Map();
-                makeGeno(f0geno);
-                }
-        f0genoknown=1;
-        }
-return f0geno;
+        if (buildstatus == building)
+                logPrintf("Model", "getGeno", LOG_WARN, "Model was not completed - missing close()");
+        if (buildstatus != valid)
+                return Geno("", '0', "", "invalid");
+        if (!f0genoknown)
+        {
+                if (autobuildmaps)
+                {
+                        initF0Map();
+                        makeGeno(f0geno, f0map);
+                }
+                else
+                {
+                        delF0Map();
+                        makeGeno(f0geno);
+                }
+                f0genoknown = 1;
+        }
+        return f0geno;
 }
 
 int Model::getPartCount() const
 {
-return parts.size();
+        return parts.size();
 }
 
 Part* Model::getPart(int i) const
 {
-return ((Part*)parts(i));
+        return ((Part*)parts(i));
 }
 
 int Model::getJointCount() const
 {
-return joints.size();
+        return joints.size();
 }
 
 Joint* Model::getJoint(int i) const
 {
-return ((Joint*)joints(i));
-}
-
-int Model::findJoints(SList& result,const Part* part)
-{
-Joint *j;
-int n0=result.size();
-if (part)
-   for(int i=0;j=(Joint*)joints(i);i++)
-     if ((j->part1 == part) || (j->part2 == part)) result+=(void*)j;
-return result.size()-n0;
+        return ((Joint*)joints(i));
+}
+
+int Model::findJoints(SList& result, const Part* part)
+{
+        Joint *j;
+        int n0 = result.size();
+        if (part)
+                for (int i = 0; j = (Joint*)joints(i); i++)
+                        if ((j->part1 == part) || (j->part2 == part)) result += (void*)j;
+        return result.size() - n0;
 }
 
 int Model::findNeuro(Neuro* n)
-{return neurons.find(n);}
+{
+        return neurons.find(n);
+}
 
 int Model::findPart(Part* p)
-{return parts.find(p);}
+{
+        return parts.find(p);
+}
 
 int Model::findJoint(Joint* j)
-{return joints.find(j);}
+{
+        return joints.find(j);
+}
 
 int Model::findJoint(Part *p1, Part *p2)
 {
-Joint* j;
-for(int i=0;j=getJoint(i);i++)
-        if ((j->part1==p1)&&(j->part2==p2)) return i;
-return -1;
+        Joint* j;
+        for (int i = 0; j = getJoint(i); i++)
+                if ((j->part1 == p1) && (j->part2 == p2)) return i;
+        return -1;
 }
 
@@ -1214 +1224 @@
 void Model::calcOldNeuroCount()
 {
-if (oldneurocount>=0) return;
-oldneurocount=reorderToOldLayout();
+        if (oldneurocount>=0) return;
+        oldneurocount=reorderToOldLayout();
 }
 
 int Model::old_getNeuroCount()
 { calcOldNeuroCount();
- return oldneurocount;}
+return oldneurocount;}
 
 Neuro* Model::old_getNeuro(int i) 
@@ -1233 +1243 @@
 Neuro *Model::old_addNewNeuro()
 {
-int count=old_getNeuroCount();
-Neuro *nu=addNewNeuro();
-nu->setClassName("N");
-moveNeuro(nu->refno,oldneurocount);
-oldneurocount=count+1;
-return (Neuro*)nu;
+        int count=old_getNeuroCount();
+        Neuro *nu=addNewNeuro();
+        nu->setClassName("N");
+        moveNeuro(nu->refno,oldneurocount);
+        oldneurocount=count+1;
+        return (Neuro*)nu;
 }
 #endif
@@ -1245 +1255 @@
 
 int Model::getNeuroCount() const
-{return neurons.size();}
+{
+        return neurons.size();
+}
 
 Neuro* Model::getNeuro(int i) const
-{return (Neuro*)neurons(i);}
+{
+        return (Neuro*)neurons(i);
+}
 
 int Model::getConnectionCount() const
 {
-int n=0;
-for(int i=0;i<getNeuroCount();i++)
-        n+=getNeuro(i)->getInputCount();
-return n;
+        int n = 0;
+        for (int i = 0; i < getNeuroCount(); i++)
+                n += getNeuro(i)->getInputCount();
+        return n;
 }
 
 int Model::findNeuros(SList& result,
-                          const char* classname,const Part* part,const Joint* joint)
-{
-Neuro *nu;
-SString cn(classname);
-int n0=result.size();
-for(int i=0;nu=(Neuro*)neurons(i);i++)
-        {
-        if (part)
-                if (nu->part != part) continue;
-        if (joint)
-                if (nu->joint != joint) continue;
-        if (classname)
-                if (nu->getClassName() != cn) continue;
-        result+=(void*)nu;
-        }
-return result.size()-n0;
+        const char* classname, const Part* part, const Joint* joint)
+{
+        Neuro *nu;
+        SString cn(classname);
+        int n0 = result.size();
+        for (int i = 0; nu = (Neuro*)neurons(i); i++)
+        {
+                if (part)
+                        if (nu->part != part) continue;
+                if (joint)
+                        if (nu->joint != joint) continue;
+                if (classname)
+                        if (nu->getClassName() != cn) continue;
+                result += (void*)nu;
+        }
+        return result.size() - n0;
 }
 
@@ -1281 +1295 @@
 void Model::disturb(double amount)
 {
-int i;
-if (amount<=0) return;
-for(i=0;i<parts.size();i++)
-        {
-        Part *p=getPart(i);
-        p->p.x+=(rnd01-0.5)*amount;
-        p->p.y+=(rnd01-0.5)*amount;
-        p->p.z+=(rnd01-0.5)*amount;
-        }
-for(i=0;i<joints.size();i++)
-        {
-        Joint *j=getJoint(i);
-        Pt3D tmpp(j->part2->p);
-        tmpp-=j->part1->p;
-        j->d=j->part2->o.revTransform(tmpp);
+        int i;
+        if (amount <= 0) return;
+        for (i = 0; i < parts.size(); i++)
+        {
+                Part *p = getPart(i);
+                p->p.x += (rnd01 - 0.5)*amount;
+                p->p.y += (rnd01 - 0.5)*amount;
+                p->p.z += (rnd01 - 0.5)*amount;
+        }
+        for (i = 0; i < joints.size(); i++)
+        {
+                Joint *j = getJoint(i);
+                Pt3D tmpp(j->part2->p);
+                tmpp -= j->part1->p;
+                j->d = j->part2->o.revTransform(tmpp);
         }
 }
@@ -1301 +1315 @@
 void Model::move(const Pt3D& shift)
 {
-FOREACH(Part*,p,parts)
-        p->p+=shift;
+        FOREACH(Part*, p, parts)
+                p->p += shift;
 }
 
 void Model::rotate(const Orient& rotation)
 {
-FOREACH(Part*,p,parts)
-        {
-        p->p=rotation.transform(p->p);
-        p->setOrient(rotation.transform(p->o));
+        FOREACH(Part*, p, parts)
+        {
+                p->p = rotation.transform(p->p);
+                p->setOrient(rotation.transform(p->o));
         }
 }
@@ -1316 +1330 @@
 void Model::buildUsingNewShapes(const Model& old, Part::Shape default_shape, float thickness)
 {
-for(int i=0;i<old.getJointCount();i++)
-        {
-        Joint *oj=old.getJoint(i);
-        Part *p = addNewPart(default_shape);
-        p->p=(oj->part1->p+oj->part2->p)/2;
-        Orient o;
-        o.lookAt(oj->part1->p-oj->part2->p);
-        p->rot=o.getAngles();
-        p->scale.x=oj->part1->p.distanceTo(oj->part2->p)/2;
-        p->scale.y = thickness;
-        p->scale.z = thickness;
-        }
-for(int i=0;i<old.getPartCount();i++)
-        {
-        Part *op=old.getPart(i);
-        for(int j=0;j<old.getJointCount();j++)
-                {
-                Joint *oj=old.getJoint(j);
-                if ((oj->part1==op)||(oj->part2==op))
+        for (int i = 0; i < old.getJointCount(); i++)
+        {
+                Joint *oj = old.getJoint(i);
+                Part *p = addNewPart(default_shape);
+                p->p = (oj->part1->p + oj->part2->p) / 2;
+                Orient o;
+                o.lookAt(oj->part1->p - oj->part2->p);
+                p->rot = o.getAngles();
+                p->scale.x = oj->part1->p.distanceTo(oj->part2->p) / 2;
+                p->scale.y = thickness;
+                p->scale.z = thickness;
+        }
+        for (int i = 0; i < old.getPartCount(); i++)
+        {
+                Part *op = old.getPart(i);
+                for (int j = 0; j < old.getJointCount(); j++)
+                {
+                        Joint *oj = old.getJoint(j);
+                        if ((oj->part1 == op) || (oj->part2 == op))
                         {
-                        for(int j2=j+1;j2<old.getJointCount();j2++)
+                                for (int j2 = j + 1; j2 < old.getJointCount(); j2++)
                                 {
-                                Joint *oj2=old.getJoint(j2);
-                                if ((oj2->part1==op)||(oj2->part2==op))
+                                        Joint *oj2 = old.getJoint(j2);
+                                        if ((oj2->part1 == op) || (oj2->part2 == op))
                                         {
-                                        addNewJoint(getPart(j),getPart(j2),Joint::SHAPE_SOLID);
+                                                addNewJoint(getPart(j), getPart(j2), Joint::SHAPE_SOLID);
                                         }
                                 }
-                        break;
+                                break;
                         }
                 }
@@ -1352 +1366 @@
 //////////////////////
 
-class MinPart: public Part {public: MinPart() {Param par(f0_part_paramtab,this);par.setMin();}};
-class MaxPart: public Part {public: MaxPart() {Param par(f0_part_paramtab,this);par.setMax();}};
-class MinJoint: public Joint {public: MinJoint() {Param par(f0_joint_paramtab,this);par.setMin();}};
-class MaxJoint: public Joint {public: MaxJoint() {Param par(f0_joint_paramtab,this);par.setMax();}};
-class MinNeuro: public Neuro {public: MinNeuro() {Param par(f0_neuro_paramtab,this);par.setMin();}};
-class MaxNeuro: public Neuro {public: MaxNeuro() {Param par(f0_neuro_paramtab,this);par.setMax();}};
-
-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;}
+class MinPart : public Part { public: MinPart() { Param par(f0_part_paramtab, this); par.setMin(); } };
+class MaxPart : public Part { public: MaxPart() { Param par(f0_part_paramtab, this); par.setMax(); } };
+class MinJoint : public Joint { public: MinJoint() { Param par(f0_joint_paramtab, this); par.setMin(); } };
+class MaxJoint : public Joint { public: MaxJoint() { Param par(f0_joint_paramtab, this); par.setMax(); } };
+class MinNeuro : public Neuro { public: MinNeuro() { Param par(f0_neuro_paramtab, this); par.setMin(); } };
+class MaxNeuro : public Neuro { public: MaxNeuro() { Param par(f0_neuro_paramtab, this); par.setMax(); } };
+
+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; }

cpp/frams/model/model.h

@@ -18 +18 @@
 //#define EASYMAPDEBUG
 
-enum ModelBuildStatus {empty,building,invalid,valid};
+enum ModelBuildStatus { empty, building, invalid, valid };
 
 class MultiMap;
@@ -25 +25 @@
 
 /**
-    "Model" is the skeleton of the Framsticks creature.
-    This object can be used for 2 purposes:
-     - you can build a creature from any supported Framsticks genotype
-    format
-     - or generate low level f0 genotype from existing construct.
-
-    In both cases you have access to geometry and neuron net data.
-    Using this standard class assures compatibility and good
-    integration with core Framsticks engine.
-
-    Model contains 3 kinds of objects:
-    - Parts (class Part).
-    - Joints (class Joint). Each Joint is connected with 2 Parts. (@see Joint::attachToParts()).
-    - Neurons (class Neuro). Neuron can have 0 or more inputs - other neurons. (@see Neuro::addInput()).
-      Each Neuron can be located on the physical structure, i.e. it can ba attached to Part or Joint
-      (@see Neuro::attachToPart(), Neuro::attachToJoint()).
-
-\f[(dot)
-digraph Model
- {
-  Joint1; Joint2;
-  node [ shape=box ]
-  Part1; Part2; Part3;
-  Joint1 -> Part1; Joint1 -> Part2; Joint2 -> Part2; Joint2 -> Part3
-  node [ shape=diamond ]
-  Neuro1 -> Neuro2; Neuro1 -> Neuro3; Neuro2 -> Neuro2; Neuro3 -> Neuro2;
-  Neuro1 -> Part1; Neuro2 -> Joint2;
- }
-\f]
-*/
-
-class Model: public DestrBase
+        "Model" is the skeleton of the Framsticks creature.
+        This object can be used for 2 purposes:
+        - you can build a creature from any supported Framsticks genotype
+        format
+        - or generate low level f0 genotype from existing construct.
+
+        In both cases you have access to geometry and neuron net data.
+        Using this standard class assures compatibility and good
+        integration with core Framsticks engine.
+
+        Model contains 3 kinds of objects:
+        - Parts (class Part).
+        - Joints (class Joint). Each Joint is connected with 2 Parts. (@see Joint::attachToParts()).
+        - Neurons (class Neuro). Neuron can have 0 or more inputs - other neurons. (@see Neuro::addInput()).
+        Each Neuron can be located on the physical structure, i.e. it can ba attached to Part or Joint
+        (@see Neuro::attachToPart(), Neuro::attachToJoint()).
+
+        \f[(dot)
+        digraph Model
+        {
+        Joint1; Joint2;
+        node [ shape=box ]
+        Part1; Part2; Part3;
+        Joint1 -> Part1; Joint1 -> Part2; Joint2 -> Part2; Joint2 -> Part3
+        node [ shape=diamond ]
+        Neuro1 -> Neuro2; Neuro1 -> Neuro3; Neuro2 -> Neuro2; Neuro3 -> Neuro2;
+        Neuro1 -> Part1; Neuro2 -> Joint2;
+        }
+        \f]
+        */
+
+class Model : public DestrBase
 {
-  protected:
-Geno geno,f0geno;
-char modelfromgenotype;
-char f0genoknown;
-/// make model map in build()
-bool autobuildmaps;
-/// valid if build from f0 genotype
-int f0errorposition;
-/// valid if build from f0 genotype
-int f0warnposition;
-
-ModelBuildStatus buildstatus;
-/// NULL if the map is not (yet) created
-MultiMap *map,*f0map;
-
-SList parts,joints,neurons;
-char partmappingchanged;
+protected:
+        Geno geno, f0geno;
+        char modelfromgenotype;
+        char f0genoknown;
+        /// make model map in build()
+        bool autobuildmaps;
+        /// valid if build from f0 genotype
+        int f0errorposition;
+        /// valid if build from f0 genotype
+        int f0warnposition;
+
+        ModelBuildStatus buildstatus;
+        /// NULL if the map is not (yet) created
+        MultiMap *map, *f0map;
+
+        SList parts, joints, neurons;
+        char partmappingchanged;
 
 #ifdef MODEL_V1_COMPATIBLE
-/** NeuroCount value.
-    compatibility_neurocount = -1 if its value is unknown and the layout is not compatible
-    @see reorderToOldLayout()
-*/
-int oldneurocount;
-char oldconnections;
-
-/** calculate oldNeuroCount */
-void calcOldNeuroCount();
-/** some new calls can invalidate old compatibility data */
-void invalidateOldNeuroCount() {oldneurocount=-1;}
-/**
-   for compatibility with old NeuroClass the layout of Neurons
-   is changed when old 'Neuro' accessing methods are in use.
-   Neurons:
-   0 .. compatibility_neurocount-1                : old Neurons (class "N")
-   compatibility_neurocount .. neurons.size()-1   : other units
-*/
-int reorderToOldLayout();
-
-/** check if compatibility should be preserved */
-int hasOldNeuroLayout() {return oldneurocount>=0;}
-
-/** add inputs to the old "-" units.
-    @return 1=ok, 0=invalid input detected  */
-int addOldConnectionsInputs();
+        /** NeuroCount value.
+                compatibility_neurocount = -1 if its value is unknown and the layout is not compatible
+                @see reorderToOldLayout()
+                */
+        int oldneurocount;
+        char oldconnections;
+
+        /** calculate oldNeuroCount */
+        void calcOldNeuroCount();
+        /** some new calls can invalidate old compatibility data */
+        void invalidateOldNeuroCount() {oldneurocount=-1;}
+        /**
+           for compatibility with old NeuroClass the layout of Neurons
+           is changed when old 'Neuro' accessing methods are in use.
+           Neurons:
+           0 .. compatibility_neurocount-1                : old Neurons (class "N")
+           compatibility_neurocount .. neurons.size()-1   : other units
+           */
+        int reorderToOldLayout();
+
+        /** check if compatibility should be preserved */
+        int hasOldNeuroLayout() {return oldneurocount>=0;}
+
+        /** add inputs to the old "-" units.
+                @return 1=ok, 0=invalid input detected  */
+        int addOldConnectionsInputs();
 #endif
 
-void internalCopy(const Model &mod);
-
-/// make the model from current genotype
-void build();
-
-friend class NeuroNetFactory;
-friend class VisualModel;
-friend class GLVisualModel;
-friend class Creature;
-friend class PartBase;
-
-int checklevel;
-
-  public:
-enum Shape {SHAPE_UNKNOWN,SHAPE_ILLEGAL,SHAPE_OLD,SHAPE_NEW};
-  protected:
-Shape shape;
-
-void updateNeuroRefno(); // set Neuro::refno for all neurons
-SString nameForErrors() const;
-int internalcheck(int final);
-
-void moveNeuro(int oldpos,int newpos);
-
-void init(const Geno &srcgen);
-void init();
-
-void delMap();
-void delF0Map();
-void initMap();
-void initF0Map();
+        void internalCopy(const Model &mod);
+
+        /// make the model from current genotype
+        void build();
+
+        friend class NeuroNetFactory;
+        friend class VisualModel;
+        friend class GLVisualModel;
+        friend class Creature;
+        friend class PartBase;
+
+        int checklevel;
 
 public:
-/** get current model state.
-\f[(dot)
-digraph M
- {
- node [fontsize=12]
- edge [fontsize=10]
- building [label="building = can be modified"]
- valid -> building [label="open()"]
- building -> valid [label="close()"]
- invalid -> building [label="open()"]
- building -> invalid [label="close() [failed]"]
- empty -> building [label="open()"]
- }
-\f]
-*/
-ModelBuildStatus getStatus() const {return buildstatus;}
-int isValid() const {return buildstatus==valid;}
-int getErrorPosition(bool includingwarnings=false);
-Shape getShape() {return shape;}
-
-void updateRefno(); // set ::refno for all elements
-
-/// The bounding box size. Valid if the model is valid. Read only.
-Pt3D size;
-
-SString vis_style;
-double startenergy;
-Callback delmodel_list;
-ModelUserTags userdata;
-
-/// Create empty model with invalid empty genotype
-Model();
-
-/** Create a model based on provided genotype
-   @param buildmaps if not 0, generate mapping information for the model.
-   default is 0, because mapping uses additional time and memory.
-   @see getMap()
- */
-Model(const Geno &src,bool buildmaps=false);
-Model(const Model &mod,bool buildmaps=false);
-/** duplicate the model.
-    the resulting object's status is 'building' (opened).
-    @see getStatus()
- */
-void operator=(const Model &source);
-
-/** move all elements from 'source' into our model object.
-    'source' becomes empty after this operation.
-    the model will be opened if it is not already open.
-    @see addElementsFrom(const Model &source);
- */
-void moveElementsFrom(Model &source);
-
-/** copy all elements from 'source' into our model object
-    without affecting the 'source'.
-    the model will be opened if it is not already open.
-    @see moveElementsFrom(Model &source);
- */
-void addElementsFrom(const Model &source)
-{Model m(source); moveElementsFrom(m);}
-
-void operator+=(const Model &source)
-{addElementsFrom(source);}
-
-~Model();
-
-/** @return source genotype.
-    @warn source genotype will not automatically change 
-    when the model is modified. this behaviour is inconsistent
-    with the previous release. use getF0Geno() if you need
-    the updated genotype.
-    @see getF0Geno(), setGeno()
-*/
-const Geno &getGeno() const;
-
-/// change source genotype
-void setGeno(const Geno& newgeno);
-
-/** @return f0 genotype - generated from current model state
-    don't use between open()-close()
-*/
-const Geno getF0Geno();
-
-/// make f0 genotype from current construction (low level version of getF0Geno)
-void makeGeno(Geno &,MultiMap *map=0,bool handle_defaults=true);
-
-/** @return Mapping from source genotype (0-based position in text) to model elements reference numbers.
-    Read about how mappings work: http://www.framsticks.com/files/common/GeneticMappingsInArtificialGenomes.pdf
-    The map can be empty if the mapping hasn't been requested earlier (in constructor)
-    or the converters don't support mapping.
-    If you create or modify the model using singleStepBuild() or direct manipulation
-    the map will be not changed or created automatically - it is your responsibility.
-    @see Model(const Geno &src,int buildmaps=0), singleStepBuild(), PartBase::addMapping()
-    @see clearMap()
-    @see convmap
-
-*/
-MultiMap &getMap();
-
-/** Read about how mappings work: http://www.framsticks.com/files/common/GeneticMappingsInArtificialGenomes.pdf
-    @return mapping from f0 genotype (0-based position in text) to model elements reference numbers
- */
-const MultiMap &getF0Map();
-
-/** discard all mapping information for this model.
-    getMap().clear() also works, but it doesn't remove mappings from model elements.
-    If there are any mappings, they will be incorporated into model map during close().
-    @see close(), getMap(), PartBase::clearMapping()
- */
-void clearMap();
-
-/** Generate mapping from the current genotype to the f0 genotype.
-    This works only if both current and f0 maps are already known.
-    Read about how mappings work: http://www.framsticks.com/files/common/GeneticMappingsInArtificialGenomes.pdf
-    @see convmap
-*/
-void getCurrentToF0Map(MultiMap& m);
-
-void setValidationLevel(int level)
-        {checklevel=level;}
-
-/// calculate location of the new part connected to the existing one
-/// using delta option
-Pt3D whereDelta(const Part& start,const Pt3D& rot, const Pt3D& delta);
-
-/// create the whole model from scratch, using current genotype
-void rebuild(bool buildmaps);
-
-/// setGeno(newgeno); rebuild();
-void rebuild(const Geno& newgeno,bool buildmaps) {setGeno(newgeno); rebuild(buildmaps);}
-
-/// reuse current model object but discard all model data
-void clear();
-
-/** Execute single line of <B>f0</B> genotype.
-    Return value is non-negative reference number of the created item,
-    or negative value. reference number can be used to access
-    the item using getPart(int), getJoint(int) and getNeuroItem(int) methods.
-    @param line_num optional line number used in error messages
-    @param srcrange source genotype range which will be mapped to this element
-*/
-int singleStepBuild(const SString &singleline,int line_num,const MultiRange* srcrange=NULL);
-/** Execute single line of <B>f0</B> genotype - compatiblity variant */
-int singleStepBuild(const SString &singleline,const MultiRange* srcrange=NULL);
-/** Execute single line of <B>f0</B> genotype - low level variant, used by Model::build(), error messages returned as string instead of calling logger */
-int singleStepBuildNoLog(const SString &singleline,SString& error_message,const MultiRange* srcrange=0);
-
-/// separate build stages (for future use)
-void checkpoint();
-
-/// call resetDelta() on all joints
-void resetAllDelta();
-
-/// call useDelta() on all joints
-void useAllDelta(bool yesno);
-
-/// Final validity check of the model, all model data has to be available at this point.
-/// If the model was modified, the genotype will be also updated.
-/// It also calls "validate" with all side effects.
-/// @return > 0 means "valid"
-int close();
-
-/// Enable model building.
-/// You should use it if you need to create new model, modify the model after close
-/// or modify the model created from the genotype.
-/// Between open() and close() the model is not fully usable.
-void open();
-
-/// Current model written as f0 genotype while building
-/// (not cached, not validated, probably unusable and bad if used before close(). But good for debugging.)
-Geno rawGeno();
-
-/// partial validity check - you can use this call
-/// anytime between open - close.
-/// this function will check (and repair)
-/// - part-joint-neuro connections
-/// - model geometry (if "delta option" was used)
-/// - physical/biological limits
-/// @return 1 = valid
-/// @return 0 = invalid
-/// validate doesn't make the model fully usable (for simulation)
-/// you still need to use close if you have changed anything
-int validate();
-
-int getPartCount() const;
-/// you can access parts 0 .. getPartCount()-1.
-Part *getPart(int i) const;
-
-int getJointCount() const;
-/// you can access joints 0 .. getJointCount()-1.
-Joint *getJoint(int i) const;
-
-int getNeuroCount() const;
-int getConnectionCount() const;
-/// you can access neurons 0 .. getNeuroCount()-1.
-Neuro *getNeuro(int i) const;
+        enum Shape { SHAPE_UNKNOWN, SHAPE_ILLEGAL, SHAPE_OLD, SHAPE_NEW };
+protected:
+        Shape shape;
+
+        void updateNeuroRefno(); // set Neuro::refno for all neurons
+        SString nameForErrors() const;
+        int internalcheck(int final);
+
+        void moveNeuro(int oldpos, int newpos);
+
+        void init(const Geno &srcgen);
+        void init();
+
+        void delMap();
+        void delF0Map();
+        void initMap();
+        void initF0Map();
+
+public:
+        /** get current model state.
+        \f[(dot)
+        digraph M
+        {
+        node [fontsize=12]
+        edge [fontsize=10]
+        building [label="building = can be modified"]
+        valid -> building [label="open()"]
+        building -> valid [label="close()"]
+        invalid -> building [label="open()"]
+        building -> invalid [label="close() [failed]"]
+        empty -> building [label="open()"]
+        }
+        \f]
+        */
+        ModelBuildStatus getStatus() const { return buildstatus; }
+        int isValid() const { return buildstatus == valid; }
+        int getErrorPosition(bool includingwarnings = false);
+        Shape getShape() { return shape; }
+
+        void updateRefno(); // set ::refno for all elements
+
+        /// The bounding box size. Valid if the model is valid. Read only.
+        Pt3D size;
+
+        SString vis_style;
+        double startenergy;
+        Callback delmodel_list;
+        ModelUserTags userdata;
+
+        /// Create empty model with invalid empty genotype
+        Model();
+
+        /** Create a model based on provided genotype
+           @param buildmaps if not 0, generate mapping information for the model.
+           default is 0, because mapping uses additional time and memory.
+           @see getMap()
+           */
+        Model(const Geno &src, bool buildmaps = false);
+        Model(const Model &mod, bool buildmaps = false);
+        /** duplicate the model.
+                the resulting object's status is 'building' (opened).
+                @see getStatus()
+                */
+        void operator=(const Model &source);
+
+        /** move all elements from 'source' into our model object.
+                'source' becomes empty after this operation.
+                the model will be opened if it is not already open.
+                @see addElementsFrom(const Model &source);
+                */
+        void moveElementsFrom(Model &source);
+
+        /** copy all elements from 'source' into our model object
+                without affecting the 'source'.
+                the model will be opened if it is not already open.
+                @see moveElementsFrom(Model &source);
+                */
+        void addElementsFrom(const Model &source)
+        {
+                Model m(source); moveElementsFrom(m);
+        }
+
+        void operator+=(const Model &source)
+        {
+                addElementsFrom(source);
+        }
+
+        ~Model();
+
+        /** @return source genotype.
+                @warn source genotype will not automatically change
+                when the model is modified. this behaviour is inconsistent
+                with the previous release. use getF0Geno() if you need
+                the updated genotype.
+                @see getF0Geno(), setGeno()
+                */
+        const Geno &getGeno() const;
+
+        /// change source genotype
+        void setGeno(const Geno& newgeno);
+
+        /** @return f0 genotype - generated from current model state
+                don't use between open()-close()
+                */
+        const Geno getF0Geno();
+
+        /// make f0 genotype from current construction (low level version of getF0Geno)
+        void makeGeno(Geno &, MultiMap *map = 0, bool handle_defaults = true);
+
+        /** @return Mapping from source genotype (0-based position in text) to model elements reference numbers.
+                Read about how mappings work: http://www.framsticks.com/files/common/GeneticMappingsInArtificialGenomes.pdf
+                The map can be empty if the mapping hasn't been requested earlier (in constructor)
+                or the converters don't support mapping.
+                If you create or modify the model using singleStepBuild() or direct manipulation
+                the map will be not changed or created automatically - it is your responsibility.
+                @see Model(const Geno &src,int buildmaps=0), singleStepBuild(), PartBase::addMapping()
+                @see clearMap()
+                @see convmap
+
+                */
+        MultiMap &getMap();
+
+        /** Read about how mappings work: http://www.framsticks.com/files/common/GeneticMappingsInArtificialGenomes.pdf
+                @return mapping from f0 genotype (0-based position in text) to model elements reference numbers
+                */
+        const MultiMap &getF0Map();
+
+        /** discard all mapping information for this model.
+                getMap().clear() also works, but it doesn't remove mappings from model elements.
+                If there are any mappings, they will be incorporated into model map during close().
+                @see close(), getMap(), PartBase::clearMapping()
+                */
+        void clearMap();
+
+        /** Generate mapping from the current genotype to the f0 genotype.
+                This works only if both current and f0 maps are already known.
+                Read about how mappings work: http://www.framsticks.com/files/common/GeneticMappingsInArtificialGenomes.pdf
+                @see convmap
+                */
+        void getCurrentToF0Map(MultiMap& m);
+
+        void setValidationLevel(int level)
+        {
+                checklevel = level;
+        }
+
+        /// calculate location of the new part connected to the existing one
+        /// using delta option
+        Pt3D whereDelta(const Part& start, const Pt3D& rot, const Pt3D& delta);
+
+        /// create the whole model from scratch, using current genotype
+        void rebuild(bool buildmaps);
+
+        /// setGeno(newgeno); rebuild();
+        void rebuild(const Geno& newgeno, bool buildmaps) { setGeno(newgeno); rebuild(buildmaps); }
+
+        /// reuse current model object but discard all model data
+        void clear();
+
+        /** Execute single line of <B>f0</B> genotype.
+                Return value is non-negative reference number of the created item,
+                or negative value. reference number can be used to access
+                the item using getPart(int), getJoint(int) and getNeuroItem(int) methods.
+                @param line_num optional line number used in error messages
+                @param srcrange source genotype range which will be mapped to this element
+                */
+        int singleStepBuild(const SString &singleline, int line_num, const MultiRange* srcrange = NULL);
+        /** Execute single line of <B>f0</B> genotype - compatiblity variant */
+        int singleStepBuild(const SString &singleline, const MultiRange* srcrange = NULL);
+        /** Execute single line of <B>f0</B> genotype - low level variant, used by Model::build(), error messages returned as string instead of calling logger */
+        int singleStepBuildNoLog(const SString &singleline, SString& error_message, const MultiRange* srcrange = 0);
+
+        /// separate build stages (for future use)
+        void checkpoint();
+
+        /// call resetDelta() on all joints
+        void resetAllDelta();
+
+        /// call useDelta() on all joints
+        void useAllDelta(bool yesno);
+
+        /// Final validity check of the model, all model data has to be available at this point.
+        /// If the model was modified, the genotype will be also updated.
+        /// It also calls "validate" with all side effects.
+        /// @return > 0 means "valid"
+        int close();
+
+        /// Enable model building.
+        /// You should use it if you need to create new model, modify the model after close
+        /// or modify the model created from the genotype.
+        /// Between open() and close() the model is not fully usable.
+        void open();
+
+        /// Current model written as f0 genotype while building
+        /// (not cached, not validated, probably unusable and bad if used before close(). But good for debugging.)
+        Geno rawGeno();
+
+        /// partial validity check - you can use this call
+        /// anytime between open - close.
+        /// this function will check (and repair)
+        /// - part-joint-neuro connections
+        /// - model geometry (if "delta option" was used)
+        /// - physical/biological limits
+        /// @return 1 = valid
+        /// @return 0 = invalid
+        /// validate doesn't make the model fully usable (for simulation)
+        /// you still need to use close if you have changed anything
+        int validate();
+
+        int getPartCount() const;
+        /// you can access parts 0 .. getPartCount()-1.
+        Part *getPart(int i) const;
+
+        int getJointCount() const;
+        /// you can access joints 0 .. getJointCount()-1.
+        Joint *getJoint(int i) const;
+
+        int getNeuroCount() const;
+        int getConnectionCount() const;
+        /// you can access neurons 0 .. getNeuroCount()-1.
+        Neuro *getNeuro(int i) const;
 
 #ifdef MODEL_V1_COMPATIBLE
-/* compatibility calls for accessing old Neuro objects */
-
-/// @deprecated Neuro class will be removed soon
-/// @see compat
-int old_getNeuroCount();
-/// you can access neurons 0 .. getNeuroCount()-1.
-/// @deprecated Neuro class will be removed soon
-Neuro *old_getNeuro(int i);
-/// @see addNewNeuro, addNeuro
-/// @deprecated Neuro class will be removed soon
-Neuro *old_addNewNeuro();
-/// @return neuro index or -1 if not found
-/// @deprecated Neuro class will be removed soon
-int old_findNeuro(Neuro* n);
+        /* compatibility calls for accessing old Neuro objects */
+
+        /// @deprecated Neuro class will be removed soon
+        /// @see compat
+        int old_getNeuroCount();
+        /// you can access neurons 0 .. getNeuroCount()-1.
+        /// @deprecated Neuro class will be removed soon
+        Neuro *old_getNeuro(int i);
+        /// @see addNewNeuro, addNeuro
+        /// @deprecated Neuro class will be removed soon
+        Neuro *old_addNewNeuro();
+        /// @return neuro index or -1 if not found
+        /// @deprecated Neuro class will be removed soon
+        int old_findNeuro(Neuro* n);
 #endif
 
-/** create new Part and add it to the model. @see addPart()  */
-Part *addNewPart(Part::Shape shape=Part::SHAPE_DEFAULT) {return addPart(new Part(shape));}
-/** create new Joint and add it to the model. @see addJoint() */
-Joint *addNewJoint(Part *p1=NULL,Part *p2=NULL,Joint::Shape shape=Joint::SHAPE_DEFAULT) { Joint *j=addJoint(new Joint()); j->shape=shape; if ((p1!=NULL)&&(p2!=NULL)) j->attachToParts(p1,p2); return j;}
-/** create new Neuro and add it to the model. @see addNeuro() */
-Neuro *addNewNeuro() {return addNeuro(new Neuro());}
-
-/** add p to the model. p->refno is adjusted. @return the Part just added (==p). */
-Part *addPart(Part *p);
-/** add j to the model. j->refno is adjusted. @return the Joint just added (==j). */
-Joint *addJoint(Joint *j);
-/** add n to the model. n->refno is adjusted. @return the Neuro just added (==n). */
-Neuro *addNeuro(Neuro *n);
-
-/** remove the part from model.
-    @param removeattachedjoints if not 0 -> remove all joints connected with this part
-    @param removeattachedneurons if not 0 -> remove neurons attached to this part */
-void removePart(int partindex,int removeattachedjoints=1,int removeattachedneurons=1);
-
-/** remove the joint from model.
-    @param removeattachedneurons if not 0 -> remove neurons attached to this joint */
-void removeJoint(int jointindex,int removeattachedneurons=1);
-
-/** remove the neuron from model.
-    @param removereferences if true -> look for references to this neuron
-    (i.e. connections from other neurons) and remove them as well */
-void removeNeuro(int neuroindex,bool removereferences=true);
-
-void removeNeuros(SList &nlist);
-
-/// @return part index or -1 if not found in the model
-int findPart(Part* p);
-/// @return joint index or -1 if not found in the model
-int findJoint(Joint* j);
-/// @return neuro index or -1 if not found in the model
-int findNeuro(Neuro* nu);
-/// @return joint index or -1 if not found in the model
-int findJoint(Part *p1, Part *p2);
-
-/** make the list of neuros satisfying given search criteria: classname,part,joint
-    @param result objects will be appended here
-    @return number of objects found  */
-int findNeuros(SList& result,const char* classname=0,const Part* part=0,const Joint* joint=0);
-
-/** search for joints connected to the part
-    @param result objects will be appended here
-    @return number of objects found  */ 
-int findJoints(SList& result,const Part* part=0);
-
-void disturb(double amount);
-void move(const Pt3D& shift);
-/// rotate around the origin (move-rotate-move to rotate around arbitrary point)
-void rotate(const Orient& rotation);
-/// rotate around the origin (move-rotate-move to rotate around arbitrary point)
-void rotate(const Pt3D& angles) {Orient o=Orient_1; o.rotate(angles); rotate(o);}
-
-/// build this model using new shapes, based on the provided model that uses old shapes. See also shapeconvert.cpp.
-void buildUsingNewShapes(const Model& src_old_shapes, Part::Shape default_shape = Part::SHAPE_CYLINDER, float thickness = 0.2);
+        /** create new Part and add it to the model. @see addPart()  */
+        Part *addNewPart(Part::Shape shape = Part::SHAPE_DEFAULT) { return addPart(new Part(shape)); }
+        /** create new Joint and add it to the model. @see addJoint() */
+        Joint *addNewJoint(Part *p1 = NULL, Part *p2 = NULL, Joint::Shape shape = Joint::SHAPE_DEFAULT) { Joint *j = addJoint(new Joint()); j->shape = shape; if ((p1 != NULL) && (p2 != NULL)) j->attachToParts(p1, p2); return j; }
+        /** create new Neuro and add it to the model. @see addNeuro() */
+        Neuro *addNewNeuro() { return addNeuro(new Neuro()); }
+
+        /** add p to the model. p->refno is adjusted. @return the Part just added (==p). */
+        Part *addPart(Part *p);
+        /** add j to the model. j->refno is adjusted. @return the Joint just added (==j). */
+        Joint *addJoint(Joint *j);
+        /** add n to the model. n->refno is adjusted. @return the Neuro just added (==n). */
+        Neuro *addNeuro(Neuro *n);
+
+        /** remove the part from model.
+                @param removeattachedjoints if not 0 -> remove all joints connected with this part
+                @param removeattachedneurons if not 0 -> remove neurons attached to this part */
+        void removePart(int partindex, int removeattachedjoints = 1, int removeattachedneurons = 1);
+
+        /** remove the joint from model.
+                @param removeattachedneurons if not 0 -> remove neurons attached to this joint */
+        void removeJoint(int jointindex, int removeattachedneurons = 1);
+
+        /** remove the neuron from model.
+                @param removereferences if true -> look for references to this neuron
+                (i.e. connections from other neurons) and remove them as well */
+        void removeNeuro(int neuroindex, bool removereferences = true);
+
+        void removeNeuros(SList &nlist);
+
+        /// @return part index or -1 if not found in the model
+        int findPart(Part* p);
+        /// @return joint index or -1 if not found in the model
+        int findJoint(Joint* j);
+        /// @return neuro index or -1 if not found in the model
+        int findNeuro(Neuro* nu);
+        /// @return joint index or -1 if not found in the model
+        int findJoint(Part *p1, Part *p2);
+
+        /** make the list of neuros satisfying given search criteria: classname,part,joint
+                @param result objects will be appended here
+                @return number of objects found  */
+        int findNeuros(SList& result, const char* classname = 0, const Part* part = 0, const Joint* joint = 0);
+
+        /** search for joints connected to the part
+                @param result objects will be appended here
+                @return number of objects found  */
+        int findJoints(SList& result, const Part* part = 0);
+
+        void disturb(double amount);
+        void move(const Pt3D& shift);
+        /// rotate around the origin (move-rotate-move to rotate around arbitrary point)
+        void rotate(const Orient& rotation);
+        /// rotate around the origin (move-rotate-move to rotate around arbitrary point)
+        void rotate(const Pt3D& angles) { Orient o = Orient_1; o.rotate(angles); rotate(o); }
+
+        /// build this model using new shapes, based on the provided model that uses old shapes. See also shapeconvert.cpp.
+        void buildUsingNewShapes(const Model& src_old_shapes, Part::Shape default_shape = Part::SHAPE_CYLINDER, float thickness = 0.2);
 
 #ifdef EASYMAPDEBUG
-static int partToMap(int i) {return 0+i;}
-static int jointToMap(int i) {return 10+i;}
-static int neuroToMap(int i) {return 20+i;}
-static int mapToPart(int i) {return i-0;}
-static int mapToJoint(int i) {return i-10;}
-static int mapToNeuro(int i) {return i-20;}
+        static int partToMap(int i) {return 0+i;}
+        static int jointToMap(int i) {return 10+i;}
+        static int neuroToMap(int i) {return 20+i;}
+        static int mapToPart(int i) {return i-0;}
+        static int mapToJoint(int i) {return i-10;}
+        static int mapToNeuro(int i) {return i-20;}
 #else
-static int partToMap(int i) {return 0x10000000+i;}
-static int jointToMap(int i) {return 0x20000000+i;}
-static int neuroToMap(int i) {return 0x30000000+i;}
-static int mapToPart(int i) {return i-0x10000000;}
-static int mapToJoint(int i) {return i-0x20000000;}
-static int mapToNeuro(int i) {return i-0x30000000;}
+        static int partToMap(int i) { return 0x10000000 + i; }
+        static int jointToMap(int i) { return 0x20000000 + i; }
+        static int neuroToMap(int i) { return 0x30000000 + i; }
+        static int mapToPart(int i) { return i - 0x10000000; }
+        static int mapToJoint(int i) { return i - 0x20000000; }
+        static int mapToNeuro(int i) { return i - 0x30000000; }
 #endif
 
-static void makeGenToGenMap(MultiMap& result,const MultiMap& gen1tomodel,const MultiMap& gen2tomodel);
-
-///////////////////////////
-
-static Part& getMinPart();
-static Part& getMaxPart();
-static Part& getDefPart();
-static Joint& getMinJoint();
-static Joint& getMaxJoint();
-static Joint& getDefJoint();
-static Neuro& getMinNeuro();
-static Neuro& getMaxNeuro();
-static Neuro& getDefNeuro();
+        static void makeGenToGenMap(MultiMap& result, const MultiMap& gen1tomodel, const MultiMap& gen2tomodel);
+
+        ///////////////////////////
+
+        static Part& getMinPart();
+        static Part& getMaxPart();
+        static Part& getDefPart();
+        static Joint& getMinJoint();
+        static Joint& getMaxJoint();
+        static Joint& getDefJoint();
+        static Neuro& getMinNeuro();
+        static Neuro& getMaxNeuro();
+        static Neuro& getDefNeuro();
 };
 

cpp/frams/util/extvalue.cpp

@@ -104 +104 @@
 }
 
-bool ExtObject::callDelegate(const char* delegate,ExtValue *args,ExtValue *ret)
-{
-Param tmp;
-ParamInterface *pi=getParamInterface(tmp);
-if (pi)
-        {
-        int f=pi->findId(delegate);
-        if (f>=0)
-                {
-                pi->call(f,args,ret);
-                return true;
-                }
-        }
-logPrintf("Genotype","get", LOG_ERROR, "Could not call delegate '%s.%s'", pi?pi->getName():"NULL",delegate);
-return false;
+bool ExtObject::callDelegate(const char* delegate, ExtValue *args, ExtValue *ret)
+{
+        Param tmp;
+        ParamInterface *pi = getParamInterface(tmp);
+        if (pi)
+        {
+                int f = pi->findId(delegate);
+                if (f >= 0)
+                {
+                        pi->call(f, args, ret);
+                        return true;
+                }
+        }
+        logPrintf("Genotype", "get", LOG_ERROR, "Could not call delegate '%s.%s'", pi ? pi->getName() : "NULL", delegate);
+        return false;
 }
 
@@ -205 +205 @@
 
         if (ref >= 0)
-                {
-                switch(format)
-                        {
-                        case NativeSerialization: return SString::sprintf("^%d", ref);
-                        case JSONSerialization: return SString("null");
-                        }
-                }
+        {
+                switch (format)
+                {
+                case NativeSerialization: return SString::sprintf("^%d", ref);
+                case JSONSerialization: return SString("null");
+                }
+        }
 
         if (isEmpty()) return SString("null");
         {
-        VectorObject *vec = VectorObject::fromObject(*this, false);
-        if (vec)
-                { ret=vec->serialize(format); goto finally; }
-        }
-        {
-        DictionaryObject *dic = DictionaryObject::fromObject(*this, false);
-        if (dic)
-                { ret=dic->serialize(format); goto finally; }
-        }
-        {
-        Param tmp_param;
-        ParamInterface *p = getParamInterface(tmp_param);
-        int m = p->findId("toVector");
-        if (m < 0)
-                m = p->findId("toDictionary");
-        if (m >= 0)
-        {
-                ExtObject o(p->getObject(m));
-                switch(format)
-                        {
-                        case NativeSerialization: ret=SString(interfaceName())+o.serialize(format); break;
-                        case JSONSerialization: ret=SString::sprintf("{\"class\":\"%s\",\"data\":%s}",interfaceName(),o.serialize(format).c_str()); break;
-                        }
-                goto finally;
-        }
-        m = p->findId("toString");
-        if (m >= 0)
-        {
-                SString str = p->getString(m);
-                sstringQuote(str);
-                switch(format)
-                        {
-                        case NativeSerialization: ret=SString(interfaceName())+"\"" +str+"\""; break;
-                        case JSONSerialization: ret=SString::sprintf("{\"class\":\"%s\",\"data\":\"%s\"}",interfaceName(),str.c_str()); break;
-                        }
-                goto finally;
-        }
+                VectorObject *vec = VectorObject::fromObject(*this, false);
+                if (vec)
+                {
+                        ret = vec->serialize(format); goto finally;
+                }
+        }
+        {
+                DictionaryObject *dic = DictionaryObject::fromObject(*this, false);
+                if (dic)
+                {
+                        ret = dic->serialize(format); goto finally;
+                }
+        }
+        {
+                Param tmp_param;
+                ParamInterface *p = getParamInterface(tmp_param);
+                int m = p->findId("toVector");
+                if (m < 0)
+                        m = p->findId("toDictionary");
+                if (m >= 0)
+                {
+                        ExtObject o(p->getObject(m));
+                        switch (format)
+                        {
+                        case NativeSerialization: ret = SString(interfaceName()) + o.serialize(format); break;
+                        case JSONSerialization: ret = SString::sprintf("{\"class\":\"%s\",\"data\":%s}", interfaceName(), o.serialize(format).c_str()); break;
+                        }
+                        goto finally;
+                }
+                m = p->findId("toString");
+                if (m >= 0)
+                {
+                        SString str = p->getString(m);
+                        sstringQuote(str);
+                        switch (format)
+                        {
+                        case NativeSerialization: ret = SString(interfaceName()) + "\"" + str + "\""; break;
+                        case JSONSerialization: ret = SString::sprintf("{\"class\":\"%s\",\"data\":\"%s\"}", interfaceName(), str.c_str()); break;
+                        }
+                        goto finally;
+                }
         }
 
         tlsGetRef(ExtObject_serialization).remove(*this);//undo nonserializable reference
-        switch(format)
-                {
-                case NativeSerialization: return SString(interfaceName())+SString::sprintf("<%p>",object ? object : paraminterface); break;
-                case JSONSerialization: return SString::sprintf("{\"class\":\"%s\"}",interfaceName()); break;
-                }
-
-  finally: // not 100% "finally", the case of nonserializable reference (directly above) returns directly without going through finally
-
-        switch(format)
-                {
-                case JSONSerialization: 
-                        tlsGetRef(ExtObject_serialization).remove(*this);//JSON only tracks recursion, does not track reuse
-                        break;
-                case NativeSerialization:; //nop (just to avoid compiler warning)
-                }
+        switch (format)
+        {
+        case NativeSerialization: return SString(interfaceName()) + SString::sprintf("<%p>", object ? object : paraminterface); break;
+        case JSONSerialization: return SString::sprintf("{\"class\":\"%s\"}", interfaceName()); break;
+        }
+
+        finally: // not 100% "finally", the case of nonserializable reference (directly above) returns directly without going through finally
+
+        switch (format)
+        {
+        case JSONSerialization:
+                tlsGetRef(ExtObject_serialization).remove(*this);//JSON only tracks recursion, does not track reuse
+                break;
+        case NativeSerialization:; //nop (just to avoid compiler warning)
+        }
 
         return ret;
@@ -359 +363 @@
 void ExtValue::setError(const SString& msg)
 {
-ErrorObject *err=new ErrorObject;
-err->message=msg;
-setObject(ErrorObject::makeDynamicObject(err));
+        ErrorObject *err = new ErrorObject;
+        err->message = msg;
+        setObject(ErrorObject::makeDynamicObject(err));
 }
 
@@ -380 +384 @@
 static ExtValue::CompareResult compareInvalid(const ExtValue& v)
 {
-        if (v.getType()==TInvalid) return ExtValue::ResultEqualUnordered;
+        if (v.getType() == TInvalid) return ExtValue::ResultEqualUnordered;
         if ((v.getType() == TInt) && (v.getInt() == 0)) return ExtValue::ResultUnequal_RelaxedEqual;
         return ExtValue::ResultMismatch; //comparing anything else with invalid is invalid
@@ -406 +410 @@
         else if (src.isNull())
                 return compareNull(*this);
-        if (getType()==TInvalid)
+        if (getType() == TInvalid)
                 return compareInvalid(src);
-        else if (src.getType()==TInvalid)
+        else if (src.getType() == TInvalid)
                 return compareInvalid(*this);
         switch (type)
@@ -961 +965 @@
                 return odata().serialize(format);
         case TInvalid:
-                if (format==NativeSerialization)
+                if (format == NativeSerialization)
                         return SString("invalid");
                 // else null --v
@@ -1044 +1048 @@
 const char* ExtValue::deserialize_inner(const char* in)
 {
-        while(isspace(*in)) in++;
+        while (isspace(*in)) in++;
         const char* ret = parseNumber(in);
         if (ret)
@@ -1146 +1150 @@
         else if (*in == '<')
         { //unserializable object
-                const char* end=in+1;
+                const char* end = in + 1;
                 while (*end)
                         if (*end == '>')
-                                {
-                                setError(SString("Unserializable class: ")+SString(in+1,end-in-1));
-                                return end+1;
-                                }
+                        {
+                        setError(SString("Unserializable class: ") + SString(in + 1, end - in - 1));
+                        return end + 1;
+                        }
                         else
                                 end++;
@@ -1231 +1235 @@
         tlsGetRef(ExtObject_serialization).begin();
         const char* ret = deserialize_inner(in);
-        if (ret) while(isspace(*ret)) ret++;
+        if (ret) while (isspace(*ret)) ret++;
         tlsGetRef(ExtObject_serialization).end();
         return ret;
@@ -1261 +1265 @@
 
 #define FIELDSTRUCT ErrorObject
-static ParamEntry errorobject_paramtab[]=
-{
-{"Error",1,3,"Error",},
-{"message",0,0,"Message","s",FIELD(message),},
-{"newFromString",0,0,"create new object","p oError(s message)",PROCEDURE(p_newfromstring),},
-{"toString",0,PARAM_READONLY | PARAM_NOSTATIC,"Textual form","s",GETONLY(toString),},
-{0,0,0,},
+static ParamEntry errorobject_paramtab[] =
+{
+        { "Error", 1, 3, "Error", },
+        { "message", 0, 0, "Message", "s", FIELD(message), },
+        { "newFromString", 0, 0, "create new object", "p oError(s message)", PROCEDURE(p_newfromstring), },
+        { "toString", 0, PARAM_READONLY | PARAM_NOSTATIC, "Textual form", "s", GETONLY(toString), },
+        { 0, 0, 0, },
 };
 #undef FIELDSTRUCT
@@ -1282 +1286 @@
 }
 
-const SString ErrorObject::TO_STRING_PREFIX="Error: ";
+const SString ErrorObject::TO_STRING_PREFIX = "Error: ";
 
 void ErrorObject::get_toString(ExtValue* ret)
 {
-ret->setString(TO_STRING_PREFIX+message);
+        ret->setString(TO_STRING_PREFIX + message);
 }
 
 void ErrorObject::p_newfromstring(ExtValue *args, ExtValue *ret)
 {
-ErrorObject *err=new ErrorObject();
-err->message=args[0].getString();
-if (err->message.startsWith(TO_STRING_PREFIX.c_str()))
-        err->message=err->message.substr(TO_STRING_PREFIX.len());
-*ret = makeDynamicObject(err);
+        ErrorObject *err = new ErrorObject();
+        err->message = args[0].getString();
+        if (err->message.startsWith(TO_STRING_PREFIX.c_str()))
+                err->message = err->message.substr(TO_STRING_PREFIX.len());
+        *ret = makeDynamicObject(err);
 }
 

cpp/frams/util/extvalue.h

@@ -70 +70 @@
         void* getTarget() const { return (subtype & 1) ? dbobject : object; }
         void* getTarget(const char* classname, bool through_barrier = true, bool warn = true) const;
-        bool callDelegate(const char* delegate,ExtValue *args,ExtValue *ret);
+        bool callDelegate(const char* delegate, ExtValue *args, ExtValue *ret);
         void setEmpty() { decref(); subtype = 0; param = NULL; object = NULL; }
         int isEmpty() const { return !param; }
@@ -84 +84 @@
         SString serialize(SerializationFormat format) const;
 
-        ExtObject(Param *p, void *o) :subtype(2), object(o), param(p) { DEBUG_EXTOBJECT("(Param,void)");}
+        ExtObject(Param *p, void *o) :subtype(2), object(o), param(p) { DEBUG_EXTOBJECT("(Param,void)"); }
         ExtObject(ParamInterface *p = 0) :subtype(0), object(0), paraminterface(p) { DEBUG_EXTOBJECT("(ParamInterface)"); }
         ExtObject(Param *p, DestrBase *o) :subtype(1 + 2), dbobject(o), param(p){ DEBUG_EXTOBJECT("(Param,DestrBase)"); incref(); }
@@ -244 +244 @@
 #define REGISTER_DESERIALIZABLE(name) ExtValue::AddDeserializable<name> deserializable_autoinit_ ## name;
 
-class ErrorObject: public DestrBase
-{
-  public:
-SString message;
-static Param& getParam();
-static Param& getStaticParam() {return getParam();}
-static ExtObject makeDynamicObject(ErrorObject* e);
-static const SString TO_STRING_PREFIX;
+class ErrorObject : public DestrBase
+{
+public:
+        SString message;
+        static Param& getParam();
+        static Param& getStaticParam() { return getParam(); }
+        static ExtObject makeDynamicObject(ErrorObject* e);
+        static const SString TO_STRING_PREFIX;
 #define STATRICKCLASS ErrorObject
-PARAMGETDEF(toString);
-PARAMPROCDEF(p_newfromstring);
+        PARAMGETDEF(toString);
+        PARAMPROCDEF(p_newfromstring);
 #undef STATRICKCLASS
 };