Changeset 139 for cpp/frams/genetics/f9

Timestamp:

02/20/14 17:49:28 (11 years ago)

Author:

sz

Message:

class renaming + minor corrections

Location:

cpp/frams/genetics/f9

Files:

• conv_f9.cpp (modified) (7 diffs)
• conv_f9.h (modified) (1 diff)
• oper_f9.h (modified) (1 diff)

cpp/frams/genetics/f9/conv_f9.cpp

@@ -10 +10 @@
 #define APPLY_DETERMINISTIC_BODY_NOISE //this representation easily produces perfectly vertical sticks that would stay upright forever. In most cases such infinite perfection is not desired, so we make the construct less perfect by perturbing its coordinates.
 
-GenoConv_F90::GenoConv_F90()
+GenoConv_f90::GenoConv_f90()
 {
         name = "Turtle3D-ortho encoding";
@@ -25 +25 @@
 //const char* turtle_commandsZ_f9="0000-+";
 
-SString GenoConv_F90::convert(SString &in, MultiMap *map)
+SString GenoConv_f90::convert(SString &in, MultiMap *map)
 {
         vector<XYZ_LOC> vertices;
@@ -55 +55 @@
 }
 
-int GenoConv_F90::addSegment(Model &m,vector<XYZ_LOC> &vertices,const XYZ_LOC &new_vertex,int recently_added)
+int GenoConv_f90::addSegment(Model &m,vector<XYZ_LOC> &vertices,const XYZ_LOC &new_vertex,int recently_added)
 {
         if (vertices.size()<1)
@@ -77 +77 @@
 }
 
-int GenoConv_F90::findVertexAt(vector<XYZ_LOC> &vertices,const XYZ_LOC &vertex)
+int GenoConv_f90::findVertexAt(vector<XYZ_LOC> &vertices,const XYZ_LOC &vertex)
 {
         for(int i=0;i<vertices.size();i++)
@@ -85 +85 @@
 
 
-int GenoConv_F90::addNewVertex(Model &m,vector<XYZ_LOC> &vertices,const XYZ_LOC &new_vertex)
+int GenoConv_f90::addNewVertex(Model &m,vector<XYZ_LOC> &vertices,const XYZ_LOC &new_vertex)
 {
         Part *p=new Part;
@@ -110 +110 @@
 }
 
-void GenoConv_F90::setColors(Model &m) //sets fixed (independent from genes) colors and widths on a model, purely for aesthetic purposes
+void GenoConv_f90::setColors(Model &m) //sets fixed (independent from genes) colors and widths on a model, purely for aesthetic purposes
 {
         //a rainbow on Joints: from the first one red, through middle green, to blue or violet - last
@@ -145 +145 @@
 }
 
-void GenoConv_F90::perturbPartLocations(Model &m) //deterministic "body noise", see APPLY_DETERMINISTIC_BODY_NOISE
+void GenoConv_f90::perturbPartLocations(Model &m) //deterministic "body noise", see APPLY_DETERMINISTIC_BODY_NOISE
 {
         for(int i=0;i<m.getPartCount();i++)

cpp/frams/genetics/f9/conv_f9.h

@@ -29 +29 @@
 
 // The f9->f0 converter
-class GenoConv_F90: public GenoConverter
+class GenoConv_f90: public GenoConverter
 {
 public:
-        GenoConv_F90();
+        GenoConv_f90();
 
-        //implementation GenoConverter method
+        //implementation of the GenoConverter method
         SString convert(SString &in, MultiMap *map);
 

cpp/frams/genetics/f9/oper_f9.h

@@ -18 +18 @@
         int crossOver(char *&g1,char *&g2,float& chg1,float& chg2);
         unsigned long style(const char *g, int pos);
-        char* getSimplest() {return "R";}
+        const char* getSimplest() {return "R";}
 
         double mut_prob; //mutation probability