Changeset 726 for cpp/frams/model/modelparts.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/modelparts.cpp (modified) (6 diffs)

cpp/frams/model/modelparts.cpp

@@ -193 +193 @@
 Neuro::Neuro(double _state, double _inertia, double _force, double _sigmo)
         :PartBase(getDefaultStyle()), state(_state)
-#ifdef MODEL_V1_COMPATIBLE
-        ,inertia(_inertia),force(_force),sigmo(_sigmo)
-#endif
-{
-#ifdef MODEL_V1_COMPATIBLE
-        olditems=0;
-#endif
+{
         flags = 0;
         myclass = 0;
@@ -217 +211 @@
         parent = 0; part = 0; joint = 0;
         parentcount = 0;
-#ifdef MODEL_V1_COMPATIBLE
-        olditems=0;
-#endif
         flags = 0;
         part_refno = -1; joint_refno = -1;
@@ -227 +218 @@
 Neuro::~Neuro()
 {
-#ifdef MODEL_V1_COMPATIBLE
-        if (olditems) delete olditems;
-#endif
         int i;
         for (i = 0; i < inputs.size(); i++)
@@ -281 +269 @@
 {
         refno = src.refno;
-#ifdef MODEL_V1_COMPATIBLE
-        neuro_refno=-1;
-        conn_refno=-1;
-        force=src.force;
-        sigmo=src.sigmo;
-        inertia=src.inertia;
-        weight=src.weight;
-        olditems=0;
-#endif
         state = src.state;
         part_refno = -1;
@@ -567 +546 @@
 #endif
 }
-
-/////// old items
-#ifdef MODEL_V1_COMPATIBLE
-void OldItems::buildlist()
-{ // guaranteed to work only for old NN layouts
-        // (neurons,neuro connections, old receptors and effectors)
-        if (listok) return;
-        // inputs can contain both neuroitem connections (details="") and direct neuron references (details="N")
-        // in OldItems we create neuroitems freom direct references
-        for(int i=0;i<neuro.getInputCount();i++)
-        {
-                float w;
-                Neuro *n=neuro.getInput(i,w);
-                if (n->isOldNeuron())
-                {
-                        Neuro *ni=new Neuro();
-                        ni->setClassName("-");
-                        ni->weight=w;
-                        ni->neuro_refno=neuro.refno;
-                        ni->conn_refno=n->refno;
-                        items+=ni;
-                        syntitems+=ni;
-                }
-                else
-                {
-                        items+=n;
-                        n->weight=w;
-                }
-        }
-        SList outputs;
-        neuro.findOutputs(outputs);
-        FOREACH(Neuro*,n,outputs)
-        {
-                if (n->isNNConnection() || n->isOldNeuron())
-                        outputs-=n;
-        }
-        items+=outputs;
-        listok=1;
-}
-
-void OldItems::freelist()
-{
-        FOREACH(Neuro*,n,syntitems)
-                delete n;
-        syntitems.clear();
-        items.clear();
-        listok=0;
-}
-
-int OldItems::getItemCount()
-{
-        buildlist();
-        return items.size();
-}
-
-NeuroItem *OldItems::getNeuroItem(int i)
-{
-        buildlist();
-        return (NeuroItem*)items(i);
-}
-
-NeuroItem *OldItems::addNewNeuroItem()
-{
-        Neuro *nu=neuro.getModel().addNewNeuro();
-        nu->setClassName("-");
-        if (listok) items+=nu;
-        neuro.addInput(nu);
-        return (NeuroItem*)nu;
-}
-
-int OldItems::findNeuroItem(NeuroItem *ni)
-{
-        buildlist();
-        return items.find((void*)ni);
-}
-#endif
 
 ///////////////////////////////////////
@@ -801 +704 @@
 }
 
-
 /////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
 
 #include F0_CLASSES_FILE
-
-#ifdef MODEL_V1_COMPATIBLE
-
-#define FIELDSTRUCT Neuro
-ParamEntry f0_old_neuro_tab[]=
-{
-        {"Connections",2,6,"n",},
-        {"Other properties",},
-        {"p",0,0,"part ref#","d",FIELD(part_refno),},
-        {"j",0,0,"joint ref#","d",FIELD(joint_refno),},
-        {"s",1,0,"state","f",FIELD(state),},
-        {"in",1,0,"Inertia","f",FIELD(inertia),},
-        {"fo",1,0,"Force","f",FIELD(force),},
-        {"si",1,0,"Sigmoid","f",FIELD(sigmo),},
-        {0,0,0,},
-}; 
-#undef FIELDSTRUCT
-
-#define FIELDSTRUCT NeuroItem
-ParamEntry f0_neuroitem_paramtab[]=
-{
-        {"Connections",3,12,"ni",},
-        {"Geometry",},
-        {"Other",},
-        {"n",0,0,"neuron ref#","d",FIELD(neuro_refno),},
-        {"c",2,0,"connection ref#","d",FIELD(conn_refno),},
-        {"w",2,0,"connection weight","f",FIELD(weight),},
-        {"p",0,0,"part ref#","d",FIELD(part_refno),},
-        {"j",0,0,"joint ref#","d",FIELD(joint_refno),},
-        {"px",1,0,"position.x","f",FIELD(pos.x),},
-        {"py",1,0,"position.y","f",FIELD(pos.y),},
-        {"pz",1,0,"position.z","f",FIELD(pos.z),},
-        {"rx",1,0,"rotation.x","f",FIELD(rot.x),},
-        {"ry",1,0,"rotation.y","f",FIELD(rot.y),},
-        {"rz",1,0,"rotation.z","f",FIELD(rot.z),},
-        {"d",2,0,"item details","s",GETSET(details),},
-        {0,0,0,},
-}; 
-#undef FIELDSTRUCT
-#endif
 
 ////////////////////////////////////////