Changeset 896 for cpp/frams/model

Timestamp:

11/30/19 01:30:22 (5 years ago)

Author:

Maciej Komosinski

Message:

Replaced #defined macros for popular random-related operations with functions

Location:

cpp/frams/model

Files:

• model.cpp (modified) (52 diffs)
• model.h (modified) (13 diffs)

cpp/frams/model/model.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -83 +83 @@
         updateRefno();
         if (using_checkpoints)
-                for (vector<Model*>::const_iterator it = mod.checkpoints.begin(); it != mod.checkpoints.end(); it++)
-                {
-                Model *m = *it;
-                Model *n = new Model(*m, m->autobuildmaps, false, true);
-                checkpoints.push_back(n);
+                for (vector<Model *>::const_iterator it = mod.checkpoints.begin(); it != mod.checkpoints.end(); it++)
+                {
+                        Model *m = *it;
+                        Model *n = new Model(*m, m->autobuildmaps, false, true);
+                        checkpoints.push_back(n);
                 }
 }
@@ -152 +152 @@
 void Model::clear()
 {
-        FOREACH(Part*, p, parts)
+        FOREACH(Part *, p, parts)
                 delete p;
-        FOREACH(Joint*, j, joints)
+        FOREACH(Joint *, j, joints)
                 delete j;
-        FOREACH(Neuro*, n, neurons)
+        FOREACH(Neuro *, n, neurons)
                 delete n;
         parts.clear(); joints.clear(); neurons.clear();
@@ -164 +164 @@
         geno = Geno();
         f0geno = Geno();
-        for (vector<Model*>::iterator it = checkpoints.begin(); it != checkpoints.end(); it++)
+        for (vector<Model *>::iterator it = checkpoints.begin(); it != checkpoints.end(); it++)
                 delete *it;
         checkpoints.clear();
@@ -195 +195 @@
 void Model::removeNeuros(SList &nlist)
 {
-        FOREACH(Neuro*, nu, nlist)
+        FOREACH(Neuro *, nu, nlist)
         {
                 int i = findNeuro(nu);
@@ -209 +209 @@
                 SList jlist;
                 findJoints(jlist, p);
-                FOREACH(Joint*, j, jlist)
+                FOREACH(Joint *, j, jlist)
                 {
                         int i = findJoint(j);
@@ -240 +240 @@
 void Model::removeNeuro(int neuroindex, bool removereferences)
 {
-        Neuro* thisN = getNeuro(neuroindex);
+        Neuro *thisN = getNeuro(neuroindex);
 
         if (removereferences)
         {
-                Neuro* n;
+                Neuro *n;
                 // remove all references to thisN
-                for (int i = 0; n = (Neuro*)neurons(i); i++)
+                for (int i = 0; n = (Neuro *)neurons(i); i++)
                 {
                         Neuro *inp;
@@ -252 +252 @@
                                 if (inp == thisN)
                                 {
-                                n->removeInput(j);
-                                j--;
+                                        n->removeInput(j);
+                                        j--;
                                 }
                 }
@@ -262 +262 @@
 }
 
-MultiMap& Model::getMap()
+MultiMap &Model::getMap()
 {
         if (!map) map = new MultiMap();
@@ -277 +277 @@
 }
 
-void Model::makeGenToGenMap(MultiMap& result, const MultiMap& gen1tomodel, const MultiMap& gen2tomodel)
+void Model::makeGenToGenMap(MultiMap &result, const MultiMap &gen1tomodel, const MultiMap &gen2tomodel)
 {
         result.clear();
@@ -285 +285 @@
 }
 
-void Model::getCurrentToF0Map(MultiMap& result)
+void Model::getCurrentToF0Map(MultiMap &result)
 {
         result.clear();
         if (!map) return;
-        const MultiMap& f0m = getF0Map();
+        const MultiMap &f0m = getF0Map();
         makeGenToGenMap(result, *map, f0m);
 }
@@ -312 +312 @@
 }
 
-Model::ItemType Model::itemTypeFromLinePrefix(const char* line)
-{
-        struct PrefixAndItem { const char* prefix; ItemType type; };
+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 }, { F0_CHECKPOINT_LINE, CheckpointType }, { NULL } };
         for (const PrefixAndItem *t = types; t->prefix != NULL; t++)
         {
-                const char* in = line;
-                const char* pattern = t->prefix;
+                const char *in = line;
+                const char *pattern = t->prefix;
                 for (; *in == *pattern; in++, pattern++)
                         if (*pattern == ':')
@@ -355 +355 @@
         for (; f0txt.getNextToken(pos, line, '\n'); lnum++)
         {
-                const char* line_ptr = line.c_str();
+                const char *line_ptr = line.c_str();
                 for (; *line_ptr; line_ptr++)
                         if (!strchr(" \r\t", *line_ptr)) break;
@@ -361 +361 @@
                 if (!*line_ptr) continue;
 
-                const char* colon = strchr(line_ptr, ':');
+                const char *colon = strchr(line_ptr, ':');
                 ItemType type = UnknownType;
                 SString excluding_prefix;
@@ -414 +414 @@
 }
 
-const MultiMap& Model::getF0Map()
+const MultiMap &Model::getF0Map()
 {
         if (!f0map)
@@ -472 +472 @@
         }
 
-        for (i = 0; p = (Part*)parts(i); i++)
+        for (i = 0; p = (Part *)parts(i); i++)
         {
                 partparam.select(p);
@@ -481 +481 @@
                         map->add(len, gen.len() - 1, partToMap(i));
         }
-        for (i = 0; j = (Joint*)joints(i); i++)
+        for (i = 0; j = (Joint *)joints(i); i++)
         {
                 jointparam.select(j);
@@ -491 +491 @@
                         map->add(len, gen.len() - 1, jointToMap(i));
         }
-        for (i = 0; n = (Neuro*)neurons(i); i++)
+        for (i = 0; n = (Neuro *)neurons(i); i++)
         {
                 neuroparam.select(n);
@@ -502 +502 @@
         for (a = 0; a < neurons.size(); a++)
         { // inputs
-                n = (Neuro*)neurons(a);
+                n = (Neuro *)neurons(a);
                 //      if ((n->getInputCount()==1)&&(n->getInput(0).refno <= n->refno))
                 //              continue; // already done with Neuro::conn_refno
@@ -510 +510 @@
                         double w;
                         NeuroConn nc;
-                        Neuro* n2 = n->getInput(b, w);
+                        Neuro *n2 = n->getInput(b, w);
                         //              if (((n2.parentcount==1)&&(n2.parent)&&(n2.parent->refno < n2.refno)) ^ 
                         //                  (n2.neuro_refno>=0))
@@ -533 +533 @@
         }
 
-        for (vector<Model*>::const_iterator it = checkpoints.begin(); it != checkpoints.end(); it++)
+        for (vector<Model *>::const_iterator it = checkpoints.begin(); it != checkpoints.end(); it++)
         {
                 Geno g = (*it)->getF0Geno();
@@ -562 +562 @@
 }
 
-Model* Model::getCheckpoint(int i)
+Model *Model::getCheckpoint(int i)
 {
         return checkpoints[i];
@@ -575 +575 @@
 }
 
-void Model::setGeno(const Geno& newgeno)
+void Model::setGeno(const Geno &newgeno)
 {
         geno = newgeno;
@@ -586 +586 @@
         delMap();
         delF0Map();
-        for (i = 0; p = (Part*)parts(i); i++)
+        for (i = 0; p = (Part *)parts(i); i++)
                 p->clearMapping();
-        for (i = 0; j = (Joint*)joints(i); i++)
+        for (i = 0; j = (Joint *)joints(i); i++)
                 j->clearMapping();
-        for (i = 0; n = (Neuro*)neurons(i); i++)
+        for (i = 0; n = (Neuro *)neurons(i); i++)
                 n->clearMapping();
 }
@@ -607 +607 @@
                         Part *p; Joint *j; Neuro *n;
                         int i;
-                        for (i = 0; p = (Part*)parts(i); i++)
+                        for (i = 0; p = (Part *)parts(i); i++)
                                 if (p->getMapping())
                                         map->add(*p->getMapping(), partToMap(i));
-                        for (i = 0; j = (Joint*)joints(i); i++)
+                        for (i = 0; j = (Joint *)joints(i); i++)
                                 if (j->getMapping())
                                         map->add(*j->getMapping(), jointToMap(i));
-                        for (i = 0; n = (Neuro*)neurons(i); i++)
+                        for (i = 0; n = (Neuro *)neurons(i); i++)
                                 if (n->getMapping())
                                         map->add(*n->getMapping(), neuroToMap(i));
@@ -629 +629 @@
 }
 
-Pt3D Model::whereDelta(const Part& start, const Pt3D& rot, const Pt3D& delta)
+Pt3D Model::whereDelta(const Part &start, const Pt3D &rot, const Pt3D &delta)
 {
         Orient roto;
@@ -641 +641 @@
 }
 
-int Model::addFromString(ItemType item_type, const SString &singleline, 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)
+int Model::addFromString(ItemType item_type, const SString &singleline, int line_num, const MultiRange *srcrange)
 {
         SString error_message;
@@ -654 +654 @@
                 if (error_message.len() == 0) // generic error when no detailed message is available
                         error_message = "Invalid f0 code";
-                if (line_num>0)
+                if (line_num > 0)
                         error_message += SString::sprintf(", line #%d", line_num);
                 error_message += nameForErrors();
@@ -662 +662 @@
 }
 
-int Model::addFromStringNoLog(ItemType item_type, 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();
@@ -831 +831 @@
 SString Model::nameForErrors() const
 {
-        if (geno.getName().len()>0)
+        if (geno.getName().len() > 0)
                 return SString::sprintf(" in '%s'", geno.getName().c_str());
         return SString::empty();
@@ -850 +850 @@
         else
         {
-                Pt3D bbmin = ((Part*)parts(0))->p, bbmax = bbmin;
+                Pt3D bbmin = ((Part *)parts(0))->p, bbmax = bbmin;
                 for (i = 0; i < parts.size(); i++)
                 {
-                        p = (Part*)parts(i);
+                        p = (Part *)parts(i);
                         p->owner = this;
                         if (checklevel > 0)
@@ -894 +894 @@
                 for (i = 0; i < joints.size(); i++)
                 {
-                        j = (Joint*)joints(i);
+                        j = (Joint *)joints(i);
                         // VALIDMINMAX are managed manually when adding joint properties in f0-def!
                         // (could be made dynamic but not really worth the effort)
@@ -979 +979 @@
         for (i = 0; i < neurons.size(); i++)
         {
-                n = (Neuro*)neurons(i);
+                n = (Neuro *)neurons(i);
                 n->part_refno = (n->part) ? n->part->refno : -1;
                 n->joint_refno = (n->joint) ? n->joint->refno : -1;
@@ -991 +991 @@
                         for (i = 0; i < parts.size(); i++)
                         {
-                                p = (Part*)parts(i);
+                                p = (Part *)parts(i);
                                 if (p->mass <= 0.001)
                                         p->mass = 1.0;
@@ -1003 +1003 @@
                                 for (i = 0; i < joints.size(); i++)
                                 {
-                                        j = (Joint*)joints(i);
-                                        if (j->part1->flags&LINKFLAG)
+                                        j = (Joint *)joints(i);
+                                        if (j->part1->flags & LINKFLAG)
                                         {
-                                                if (!(j->part2->flags&LINKFLAG))
+                                                if (!(j->part2->flags & LINKFLAG))
                                                 {
                                                         change = 1;
@@ -1013 +1013 @@
                                         }
                                         else
-                                                if (j->part2->flags&LINKFLAG)
+                                                if (j->part2->flags & LINKFLAG)
                                                 {
-                                                if (!(j->part1->flags&LINKFLAG))
-                                                {
-                                                        change = 1;
-                                                        j->part1->flags |= LINKFLAG;
-                                                }
+                                                        if (!(j->part1->flags & LINKFLAG))
+                                                        {
+                                                                change = 1;
+                                                                j->part1->flags |= LINKFLAG;
+                                                        }
                                                 }
                                 }
@@ -1025 +1025 @@
                         for (i = 0; i < parts.size(); i++)
                         {
-                                p = (Part*)parts(i);
-                                if (!(p->flags&LINKFLAG))
+                                p = (Part *)parts(i);
+                                if (!(p->flags & LINKFLAG))
                                 {
                                         logPrintf("Model", "internalCheck", LOG_ERROR, "Not all parts connected (eg. Part #0 and Part #%d)%s", i, nameForErrors().c_str());
@@ -1037 +1037 @@
                 for (i = 0; i < joints.size(); i++)
                 {
-                        j = (Joint*)joints(i);
+                        j = (Joint *)joints(i);
                         if (j->p1_refno == j->p2_refno)
                         {
@@ -1046 +1046 @@
                         for (k = i + 1; k < joints.size(); k++)
                         {
-                                Joint* j2 = (Joint*)joints(k);
+                                Joint *j2 = (Joint *)joints(k);
                                 if (((j->p1_refno == j2->p1_refno) && (j->p2_refno == j2->p2_refno))
                                         || ((j->p1_refno == j2->p2_refno) && (j->p2_refno == j2->p1_refno)))
@@ -1073 +1073 @@
 }
 
-const Geno& Model::getGeno() const
+const Geno &Model::getGeno() const
 {
         return geno;
@@ -1106 +1106 @@
 }
 
-Part* Model::getPart(int i) const
-{
-        return ((Part*)parts(i));
+Part *Model::getPart(int i) const
+{
+        return ((Part *)parts(i));
 }
 
@@ -1116 +1116 @@
 }
 
-Joint* Model::getJoint(int i) const
-{
-        return ((Joint*)joints(i));
-}
-
-int Model::findJoints(SList& result, const Part* part)
+Joint *Model::getJoint(int i) const
+{
+        return ((Joint *)joints(i));
+}
+
+int Model::findJoints(SList &result, const Part *part)
 {
         Joint *j;
         int n0 = result.size();
         if (part)
-                for (int i = 0; j = (Joint*)joints(i); i++)
-                        if ((j->part1 == part) || (j->part2 == part)) result += (void*)j;
+                for (int i = 0; j = (Joint *)joints(i); i++)
+                        if ((j->part1 == part) || (j->part2 == part)) result += (void *)j;
         return result.size() - n0;
 }
 
-int Model::findNeuro(Neuro* n)
+int Model::findNeuro(Neuro *n)
 {
         return neurons.find(n);
 }
 
-int Model::findPart(Part* p)
+int Model::findPart(Part *p)
 {
         return parts.find(p);
 }
 
-int Model::findJoint(Joint* j)
+int Model::findJoint(Joint *j)
 {
         return joints.find(j);
@@ -1148 +1148 @@
 int Model::findJoint(Part *p1, Part *p2)
 {
-        Joint* j;
+        Joint *j;
         for (int i = 0; j = getJoint(i); i++)
                 if ((j->part1 == p1) && (j->part2 == p2)) return i;
@@ -1161 +1161 @@
 }
 
-Neuro* Model::getNeuro(int i) const
-{
-        return (Neuro*)neurons(i);
+Neuro *Model::getNeuro(int i) const
+{
+        return (Neuro *)neurons(i);
 }
 
@@ -1174 +1174 @@
 }
 
-int Model::findNeuros(SList& result,
-        const char* classname, const Part* part, const Joint* joint)
+int Model::findNeuros(SList &result,
+        const char *classname, const Part *part, const Joint *joint)
 {
         Neuro *nu;
         SString cn(classname);
         int n0 = result.size();
-        for (int i = 0; nu = (Neuro*)neurons(i); i++)
+        for (int i = 0; nu = (Neuro *)neurons(i); i++)
         {
                 if (part)
@@ -1188 +1188 @@
                 if (classname)
                         if (nu->getClassName() != cn) continue;
-                result += (void*)nu;
+                result += (void *)nu;
         }
         return result.size() - n0;
@@ -1202 +1202 @@
         {
                 Part *p = getPart(i);
-                p->p.x += (rnd01 - 0.5)*amount;
-                p->p.y += (rnd01 - 0.5)*amount;
-                p->p.z += (rnd01 - 0.5)*amount;
+                p->p.x += (rndDouble(1) - 0.5) * amount;
+                p->p.y += (rndDouble(1) - 0.5) * amount;
+                p->p.z += (rndDouble(1) - 0.5) * amount;
         }
         for (i = 0; i < joints.size(); i++)
@@ -1215 +1215 @@
 }
 
-void Model::move(const Pt3D& shift)
-{
-        FOREACH(Part*, p, parts)
+void Model::move(const Pt3D &shift)
+{
+        FOREACH(Part *, p, parts)
                 p->p += shift;
 }
 
-void Model::rotate(const Orient& rotation)
-{
-        FOREACH(Part*, p, parts)
+void Model::rotate(const Orient &rotation)
+{
+        FOREACH(Part *, p, parts)
         {
                 p->p = rotation.transform(p->p);
@@ -1230 +1230 @@
 }
 
-void Model::buildUsingSolidShapeTypes(const Model& src_ballandstick_shapes, Part::Shape use_shape, double thickness)
+void Model::buildUsingSolidShapeTypes(const Model &src_ballandstick_shapes, Part::Shape use_shape, double thickness)
 {
         for (int i = 0; i < src_ballandstick_shapes.getJointCount(); i++)
@@ -1247 +1247 @@
                 for (int i = 0; i < src_ballandstick_shapes.getPartCount(); i++)
                 {
-                Part *op = src_ballandstick_shapes.getPart(i);
-                Part *p = addNewPart(Part::SHAPE_ELLIPSOID); //always using spherical shape regardless of the 'use_shape' parameter - 'use shape' is meant for sticks!
-                p->p = op->p;
-                p->rot = op->rot;
-                p->scale.x = p->scale.y = p->scale.z = thickness;
+                        Part *op = src_ballandstick_shapes.getPart(i);
+                        Part *p = addNewPart(Part::SHAPE_ELLIPSOID); //always using spherical shape regardless of the 'use_shape' parameter - 'use shape' is meant for sticks!
+                        p->p = op->p;
+                        p->rot = op->rot;
+                        p->scale.x = p->scale.y = p->scale.z = thickness;
                 }
         for (int i = 0; i < src_ballandstick_shapes.getPartCount(); i++)
@@ -1275 +1275 @@
 }
 
-SolidsShapeTypeModel::SolidsShapeTypeModel(Model& m, Part::Shape use_shape, double thickness)
+SolidsShapeTypeModel::SolidsShapeTypeModel(Model &m, Part::Shape use_shape, double thickness)
 {
         using_model = converted_model = NULL;
@@ -1334 +1334 @@
 class MaxNeuro : public Neuro { public: MaxNeuro() { Param par(f0_neuro_paramtab, this); par.setMax(); } };
 
-Part& Model::getMinPart() { static MinPart part; return part; }
-Part& Model::getMaxPart() { static MaxPart part; return part; }
-Part& Model::getDefPart() { static Part part; return part; }
-Joint& Model::getMinJoint() { static MinJoint joint; return joint; }
-Joint& Model::getMaxJoint() { static MaxJoint joint; return joint; }
-Joint& Model::getDefJoint() { static Joint joint; return joint; }
-Neuro& Model::getMinNeuro() { static MinNeuro neuro; return neuro; }
-Neuro& Model::getMaxNeuro() { static MaxNeuro neuro; return neuro; }
-Neuro& Model::getDefNeuro() { static Neuro neuro; return neuro; }
+Part &Model::getMinPart() { static MinPart part; return part; }
+Part &Model::getMaxPart() { static MaxPart part; return part; }
+Part &Model::getDefPart() { static Part part; return part; }
+Joint &Model::getMinJoint() { static MinJoint joint; return joint; }
+Joint &Model::getMaxJoint() { static MaxJoint joint; return joint; }
+Joint &Model::getDefJoint() { static Joint joint; return joint; }
+Neuro &Model::getMinNeuro() { static MinNeuro neuro; return neuro; }
+Neuro &Model::getMaxNeuro() { static MaxNeuro neuro; return neuro; }
+Neuro &Model::getDefNeuro() { static Neuro neuro; return neuro; }

cpp/frams/model/model.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -77 +77 @@
         SList parts, joints, neurons;
         char partmappingchanged;
-        vector<Model*> checkpoints;
+        vector<Model *> checkpoints;
 
         void internalCopy(const Model &mod);
@@ -141 +141 @@
 
         int getCheckpointCount();
-        Model* getCheckpoint(int i);
+        Model *getCheckpoint(int i);
 
         /// The bounding box size. Valid if the model is valid. Read only.
@@ -201 +201 @@
 
         /// change source genotype
-        void setGeno(const Geno& newgeno);
+        void setGeno(const Geno &newgeno);
 
         /** @return f0 genotype - generated from current model state
@@ -241 +241 @@
                 @see convmap
                 */
-        void getCurrentToF0Map(MultiMap& m);
+        void getCurrentToF0Map(MultiMap &m);
 
         void setValidationLevel(int level)
@@ -250 +250 @@
         /// calculate location of the new part connected to the existing one
         /// using delta option
-        Pt3D whereDelta(const Part& start, const Pt3D& rot, const Pt3D& delta);
+        Pt3D whereDelta(const Part &start, const Pt3D &rot, const Pt3D &delta);
 
         /// create the whole model from scratch, using current genotype
@@ -256 +256 @@
 
         /// setGeno(newgeno); rebuild();
-        void rebuild(const Geno& newgeno, bool buildmaps) { setGeno(newgeno); rebuild(buildmaps); }
+        void rebuild(const Geno &newgeno, bool buildmaps) { setGeno(newgeno); rebuild(buildmaps); }
 
         /// reuse current model object but discard all model data
@@ -262 +262 @@
 
         enum ItemType { UnknownType, ModelType, PartType, JointType, NeuronType, NeuronConnectionType, CheckpointType };
-        static ItemType itemTypeFromLinePrefix(const char* line);
+        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,
@@ -270 +270 @@
                 @param srcrange source genotype range which will be mapped to this element
                 */
-        int addFromString(ItemType item_type, 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 addFromString(ItemType item_type, 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 addFromStringNoLog(ItemType item_type, 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)
@@ -357 +357 @@
 
         /// @return part index or -1 if not found in the model
-        int findPart(Part* p);
+        int findPart(Part *p);
         /// @return joint index or -1 if not found in the model
-        int findJoint(Joint* j);
+        int findJoint(Joint *j);
         /// @return neuro index or -1 if not found in the model
-        int findNeuro(Neuro* nu);
+        int findNeuro(Neuro *nu);
         /// @return joint index or -1 if not found in the model
         int findJoint(Part *p1, Part *p2);
@@ -368 +368 @@
                 @param result objects will be appended here
                 @return number of objects found  */
-        int findNeuros(SList& result, const char* classname = 0, const Part* part = 0, const Joint* joint = 0);
+        int findNeuros(SList &result, const char *classname = 0, const Part *part = 0, const Joint *joint = 0);
 
         /** search for joints connected to the part
                 @param result objects will be appended here
                 @return number of objects found  */
-        int findJoints(SList& result, const Part* part = 0);
+        int findJoints(SList &result, const Part *part = 0);
 
         void disturb(double amount);
-        void move(const Pt3D& shift);
+        void move(const Pt3D &shift);
         /// rotate around the origin (move-rotate-move to rotate around arbitrary point)
-        void rotate(const Orient& rotation);
+        void rotate(const Orient &rotation);
         /// rotate around the origin (move-rotate-move to rotate around arbitrary point)
-        void rotate(const Pt3D& angles) { Orient o = Orient_1; o.rotate(angles); rotate(o); }
+        void rotate(const Pt3D &angles) { Orient o = Orient_1; o.rotate(angles); rotate(o); }
 
         /// build this model using solid shape types, based on the provided ball-and-stick model. See also shapeconvert.cpp.
-        void buildUsingSolidShapeTypes(const Model& src_ballandstick_shapes, Part::Shape use_shape = Part::SHAPE_CYLINDER, double thickness = 0.2);
+        void buildUsingSolidShapeTypes(const Model &src_ballandstick_shapes, Part::Shape use_shape = Part::SHAPE_CYLINDER, double thickness = 0.2);
 
 protected:
@@ -403 +403 @@
         static int mapToNeuro(int i);
 
-        static void makeGenToGenMap(MultiMap& result, const MultiMap& gen1tomodel, const MultiMap& gen2tomodel);
+        static void makeGenToGenMap(MultiMap &result, const MultiMap &gen1tomodel, const MultiMap &gen2tomodel);
 
         ///////////////////////////
 
-        static Part& getMinPart();
-        static Part& getMaxPart();
-        static Part& getDefPart();
-        static Joint& getMinJoint();
-        static Joint& getMaxJoint();
-        static Joint& getDefJoint();
-        static Neuro& getMinNeuro();
-        static Neuro& getMaxNeuro();
-        static Neuro& getDefNeuro();
+        static Part &getMinPart();
+        static Part &getMaxPart();
+        static Part &getDefPart();
+        static Joint &getMinJoint();
+        static Joint &getMaxJoint();
+        static Joint &getDefJoint();
+        static Neuro &getMinNeuro();
+        static Neuro &getMaxNeuro();
+        static Neuro &getDefNeuro();
 };
 
@@ -436 +436 @@
         Model *converted_model;
         Model *using_model;
-        SolidsShapeTypeModel(Model& m, Part::Shape use_shape = Part::SHAPE_CYLINDER, double thickness = 0.2);
-        operator Model&() { return *using_model; }
-        Model& getModel() { return *using_model; }
+        SolidsShapeTypeModel(Model &m, Part::Shape use_shape = Part::SHAPE_CYLINDER, double thickness = 0.2);
+        operator Model &() { return *using_model; }
+        Model &getModel() { return *using_model; }
         ~SolidsShapeTypeModel() { if (converted_model) delete converted_model; }
 };