Changeset 726 for cpp/frams/model/model.cpp

Timestamp:

01/19/18 19:37:43 (6 years ago)

Author:

Maciej Komosinski

Message:

• Changed Model::singleStepBuild() to Model::addFromString() to create model elements; the latter requires explicit indication of element type (P/J/N/C)
• Removed old compatibility source (#ifdef MODEL_V1_COMPATIBLE) from f1->f0 converter and neuron definitions

File:

• cpp/frams/model/model.cpp (modified) (15 diffs)

cpp/frams/model/model.cpp

@@ -22 +22 @@
         startenergy = 1.0;
         checklevel = 1;
-#ifdef MODEL_V1_COMPATIBLE
-        oldneurocount=-1; // == unknown
-        oldconnections=0;
-#endif
         map = 0;
         f0map = 0;
@@ -295 +291 @@
 }
 
+Model::ItemType Model::itemTypeFromLinePrefix(const char* line)
+{
+struct PrefixAndItem { const char* prefix; ItemType type; };
+static const PrefixAndItem types[]={ {"m:",ModelType},{"p:",PartType},{"j:",JointType},{"n:",NeuronType},{"c:",NeuronConnectionType},{NULL} };
+for(const PrefixAndItem *t=types;t->prefix!=NULL;t++)
+        {
+        const char* in=line;
+        const char* pattern=t->prefix;
+        for(;*in==*pattern;in++,pattern++)
+                if (*pattern==':')
+                        return t->type;
+        }
+return UnknownType;
+}
+
 void Model::build()
 {
@@ -322 +333 @@
         for (; f0txt.getNextToken(pos, line, '\n'); lnum++)
         {
+                const char* line_ptr=line.c_str();
+                for (; *line_ptr; line_ptr++)
+                        if (!strchr(" \r\t", *line_ptr)) break;
+                if (*line_ptr == '#') continue;
+                if (!*line_ptr) continue;
+
+                const char* colon=strchr(line_ptr,':');
+                ItemType type=UnknownType;
+                SString excluding_prefix;
+                if (colon!=NULL)
+                        {
+                        colon++;
+                        type=itemTypeFromLinePrefix(line_ptr);
+                        for (; *colon; colon++)
+                                if (!strchr(" \r\t", *colon)) break;
+                        excluding_prefix=colon;
+                        }
+                
                 if (autobuildmaps)
                 {
@@ -328 +357 @@
                 }
                 mh.reset();
-                if (singleStepBuild(line, lnum, autobuildmaps ? (&frommap) : 0) == -1)
+                if (addFromString(type, excluding_prefix, lnum, autobuildmaps ? (&frommap) : 0) == -1)
                 {
                         buildstatus = invalid;
@@ -558 +587 @@
 }
 
-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)
+int Model::addFromString(ItemType item_type, const SString &singleline, const MultiRange* srcrange)
+{
+        return addFromString(item_type,singleline, 0, srcrange);
+}
+
+int Model::addFromString(ItemType item_type, const SString &singleline, int line_num, const MultiRange* srcrange)
 {
         SString error_message;
-        int result = singleStepBuildNoLog(singleline, error_message, srcrange);
+        int result = addFromStringNoLog(item_type, singleline, error_message, srcrange);
         if (result < 0)
         {
@@ -579 +608 @@
 }
 
-int Model::singleStepBuildNoLog(const SString &line, SString& error_message, const MultiRange* srcrange)
+int Model::addFromStringNoLog(ItemType item_type, const SString &line, SString& error_message, const MultiRange* srcrange)
 {
         error_message = SString::empty();
-        const char*t = line.c_str();
         ParamInterface::LoadOptions opts;
-        for (; *t; t++, opts.offset++)
-                if (!strchr(" \r\t", *t)) break;
-        if (*t == '#') return 0;
-        if (!*t) return 0;
-        if (!strncmp(t, "p:", 2))
-        {
+        switch(item_type)
+                {
+                case PartType:
+                {
                 Param partparam(f0_part_paramtab);
                 Part *p = new Part();
                 partparam.select(p);
-                opts.offset += 2;
                 partparam.load(ParamInterface::FormatSingleLine, line, &opts);
                 if (opts.parse_failed) { delete p; error_message = "Invalid 'p:'"; return -1; }
@@ -601 +626 @@
                 if (srcrange) p->setMapping(*srcrange);
                 return getPartCount() - 1;
-        }
-        if (!strncmp(t, "m:", 2))
-        {
+                }
+
+                case ModelType:
+                {
                 Param modelparam(f0_model_paramtab);
                 modelparam.select(this);
-                opts.offset += 2;
                 modelparam.load(ParamInterface::FormatSingleLine, line, &opts);
                 if (opts.parse_failed) { error_message = "Invalid 'm:'"; return -1; }
                 return 0;
-        }
-        else if (!strncmp(t, "j:", 2))
-        {
+                }
+
+                case JointType:
+                {
                 Param jointparam(f0_joint_paramtab);
                 Joint *j = new Joint();
                 jointparam.select(j);
-                opts.offset += 2;
                 j->owner = this;
                 jointparam.load(ParamInterface::FormatSingleLine, line, &opts);
@@ -640 +665 @@
                         return -1;
                 }
-        }
-        else if (!strncmp(t, "n:", 2)) // neuro (or the old neuro object as the special case)
-        {
+                }
+
+                case NeuronType:
+                {
                 Param neuroparam(f0_neuro_paramtab);
                 Neuro *nu = new Neuro();
                 neuroparam.select(nu);
-                opts.offset += 2;
                 neuroparam.load(ParamInterface::FormatSingleLine, line, &opts);
                 if (opts.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
-                        {
-                                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
@@ -680 +690 @@
                         }
                         */
-#ifdef MODEL_V1_COMPATIBLE
-                nu->weight=1.0;
-#endif
                 nu->owner = this;
                 // attach to part/joint
@@ -703 +710 @@
                 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
-        {
+                }
+
+                case NeuronConnectionType:                      
+                {
                 Param ncparam(f0_neuroconn_paramtab);
                 NeuroConn c;
                 ncparam.select(&c);
-                opts.offset += 2;
                 ncparam.load(ParamInterface::FormatSingleLine, line, &opts);
                 if (opts.parse_failed) { error_message = "Invalid 'c:'"; return -1; }
@@ -739 +736 @@
                 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);
-                opts.offset+=3;
-                neuroitemparam.loadSingleLine(line,opts);
-                if (opts.parse_failed) {delete nu; return -1;}
-                // illegal parent?
-                if ((nu->neuro_refno<0)||(nu->neuro_refno>=old_getNeuroCount()))
-                {
-                        delete nu;
+                }
+
+                case UnknownType: //handled by addFromString for uniform error handling
                         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;
-}
-
-#ifdef MODEL_V1_COMPATIBLE
-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())
-                                { // 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--;
-                                }
-                                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
+        return -1;
+}
+
 
 /////////////
@@ -847 +756 @@
         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();
-#endif
-}
-
-#ifdef MODEL_V1_COMPATIBLE
-/** move all old neurons (class "N") to the front of the neurons list.
-        @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;
-}
-#endif
+}
+
 ////////////
 
@@ -1058 +934 @@
                 }
         }
-#ifdef MODEL_V1_COMPATIBLE
-        if (!addOldConnectionsInputs())
-                return 0;
-#endif
 
         updateNeuroRefno(); // valid refno is important for n-n connections check (later)
@@ -1068 +940 @@
         {
                 n = (Neuro*)neurons(i);
-#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;
@@ -1245 +1109 @@
 }
 
-
-////////////////////
-
-#ifdef MODEL_V1_COMPATIBLE
-void Model::calcOldNeuroCount()
-{
-        if (oldneurocount>=0) return;
-        oldneurocount=reorderToOldLayout();
-}
-
-int Model::old_getNeuroCount()
-{ calcOldNeuroCount();
-return oldneurocount;}
-
-Neuro* Model::old_getNeuro(int i) 
-{calcOldNeuroCount();
-return (i<oldneurocount)? (Neuro*)getNeuro(i) : (Neuro*)0;
-}
-
-int Model::old_findNeuro(Neuro* n)
-{calcOldNeuroCount();
-return findNeuro(n);}
-
-Neuro *Model::old_addNewNeuro()
-{
-        int count=old_getNeuroCount();
-        Neuro *nu=addNewNeuro();
-        nu->setClassName("N");
-        moveNeuro(nu->refno,oldneurocount);
-        oldneurocount=count+1;
-        return (Neuro*)nu;
-}
-#endif
-
 ///////////////////////