Changeset 774 for cpp/frams/genetics/f4/conv_f4.cpp

Timestamp:

04/11/18 01:16:08 (6 years ago)

Author:

Maciej Komosinski

Message:

Removed unused "state" field (issue number 19), improved docs (issues number 20,21,23), code formatting (issue number 24) [closes #62]

File:

• cpp/frams/genetics/f4/conv_f4.cpp (modified) (7 diffs)

cpp/frams/genetics/f4/conv_f4.cpp

@@ -25 +25 @@
 
 
-SString GenoConv_f40::convert(SString &in, MultiMap * map, bool using_checkpoints)
+SString GenoConv_f40::convert(SString &in, MultiMap *map, bool using_checkpoints)
 {
         int res;
-        f4_Model * model = new f4_Model();
+        f4_Model *model = new f4_Model();
         res = model->buildFromF4(in, using_checkpoints);
         if (GENOPER_OK != res) return SString();  // oops
@@ -50 +50 @@
 
 
-SString GenoConv_F41_TestOnly::convert(SString &in, MultiMap * map, bool using_checkpoints)
+SString GenoConv_F41_TestOnly::convert(SString &in, MultiMap *map, bool using_checkpoints)
 {
         int res;
-        f4_Model * model = new f4_Model();
+        f4_Model *model = new f4_Model();
         res = model->buildFromF4(in, using_checkpoints);
         if (GENOPER_OK != res) return SString();  // oops
@@ -126 +126 @@
 
 
-f4_Cell * f4_Model::getStick(f4_Cell * C)
+f4_Cell* f4_Model::getStick(f4_Cell *C)
 {
         if (T_STICK4 == C->type) return C;
@@ -142 +142 @@
 
 /// updated by Macko to follow new SDK standards (no more neuroitems)
-int f4_Model::buildModelRec(f4_Cell * C)
+int f4_Model::buildModelRec(f4_Cell *C)
 {
         int partidx;
@@ -192 +192 @@
                         // adjust mass/vol of first endpoint
                         jj_p1_refno = C->dadlink->p2_refno;
-                        Part * p1 = getPart(jj_p1_refno);
+                        Part *p1 = getPart(jj_p1_refno);
                         p1->mass += 1.0;
                         //      p1->volume += 1.0/C->P.mass;
@@ -230 +230 @@
         if (C->type == T_NEURON4) ///<this case was updated by MacKo
         {
-                const char * nclass = C->neuclass->name.c_str();
+                const char* nclass = C->neuclass->name.c_str();
                 int partno, jointno;
                 if (C->neuclass->getPreferredLocation() == 0)
@@ -298 +298 @@
                         if (C->links[j]->from == NULL)
                         {
-                                const char * nclass = C->links[j]->t.c_str();
-                                char * temp = (char*)C->links[j]->t.c_str();
-                                NeuroClass * sensortest = GenoOperators::parseNeuroClass(temp);
+                                const char* nclass = C->links[j]->t.c_str();
+                                char* temp = (char*)C->links[j]->t.c_str();
+                                NeuroClass *sensortest = GenoOperators::parseNeuroClass(temp);
                                 //backward compatibility for G*TS
                                 if (C->links[j]->t == "*" || C->links[j]->t == "S" || C->links[j]->t == "T")