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

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.h (modified) (4 diffs)

cpp/frams/model/modelparts.h

@@ -19 +19 @@
 
 #include <stdio.h>
-
-//#define MODEL_V1_COMPATIBLE
 
 class Model;
@@ -289 +287 @@
 class Neuro;
 
-#ifdef MODEL_V1_COMPATIBLE
-class NeuroItem;
-
-/** for compatibility with old Neuro/NeuroItem  */
-class OldItems
-{
-        Neuro &neuro;
-        SList syntitems; ///< to be deleted
-        SList items;
-        int listok;
-public:
-        OldItems(Neuro &n):neuro(n),listok(0) {}
-        ~OldItems() {freelist();}
-        void buildlist();
-        void freelist();
-
-        int getItemCount();
-        NeuroItem *getNeuroItem(int i);
-        NeuroItem *addNewNeuroItem();
-        int findNeuroItem(NeuroItem *n);
-};
-#endif
-
 /** Single processing unit in Framsticks NN.  */
 class Neuro : public PartBase
@@ -482 +457 @@
         static int getClassIndex(const NeuroClass*nc);
 
-#ifdef MODEL_V1_COMPATIBLE
-        friend class OldItems;
-        paInt neuro_refno; ///< parent ref# (called neuro_refno for compatibility with old Neuro class), @see moredata
-        paInt conn_refno; ///< the other neuron ref# in N-N connections, can be used by some other items
-        double weight; ///< weight of the N-N connection and (all?) receptors
-        double inertia,force,sigmo; //!!!
-
-        /** @deprecated provided only for compatibility with old Neuro/NeuroItem classes.
-                use getInputCount() instead. @sa getInputCount() */
-        int getItemCount() {return oldItems().getItemCount();}
-
-        /** @deprecated provided only for compatibility with old Neuro/NeuroItem classes.
-                use getInput() instead. @sa getInput() */
-        NeuroItem* getNeuroItem(int i) {return oldItems().getNeuroItem(i);}
-#endif
-
-protected:
-#ifdef MODEL_V1_COMPATIBLE
-        /** old Neuro compatibility */
-        OldItems* olditems;
-        OldItems& oldItems() {if (!olditems) olditems=new OldItems(*this); return *olditems;}
-        void invalidateOldItems() {if (olditems) olditems->freelist();}
-#endif
-
-public:
-
         // not really private, but you should not access those directly
         double state;
@@ -522 +471 @@
 };
 
-#ifdef MODEL_V1_COMPATIBLE
-class NeuroItem;
-
-/// for compatibility with old NeuroItem class.
-class NeuroItem: public Neuro
-{
-public:
-        NeuroItem() {}
-};
-#endif
-
 class NeuroExt : public Neuro
 {