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

cpp/frams/model/model.h

@@ -75 +75 @@
         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();
-#endif
 
         void internalCopy(const Model &mod);
@@ -284 +255 @@
         void clear();
 
+        enum ItemType { UnknownType,ModelType,PartType,JointType,NeuronType,NeuronConnectionType };
+        static ItemType itemTypeFromLinePrefix(const char* line);
         /** Execute single line of <B>f0</B> genotype.
                 Return value is non-negative reference number of the created item,
@@ -291 +264 @@
                 @param srcrange source genotype range which will be mapped to this element
                 */
-        int singleStepBuild(const SString &singleline, int line_num, const MultiRange* srcrange = NULL);
+        int addFromString(ItemType item_type,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);
+        int addFromString(ItemType item_type,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);
+        int addFromStringNoLog(ItemType item_type,const SString &singleline, SString& error_message, const MultiRange* srcrange = 0);
 
         /// separate build stages (for future use)
@@ -346 +319 @@
         /// 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);
-#endif
 
         /** create new Part and add it to the model. @see addPart()  */