Changeset 139 for cpp/frams/genetics/f9


Ignore:
Timestamp:
02/20/14 17:49:28 (10 years ago)
Author:
sz
Message:

class renaming + minor corrections

Location:
cpp/frams/genetics/f9
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/genetics/f9/conv_f9.cpp

    r125 r139  
    1010#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.
    1111
    12 GenoConv_F90::GenoConv_F90()
     12GenoConv_f90::GenoConv_f90()
    1313{
    1414        name = "Turtle3D-ortho encoding";
     
    2525//const char* turtle_commandsZ_f9="0000-+";
    2626
    27 SString GenoConv_F90::convert(SString &in, MultiMap *map)
     27SString GenoConv_f90::convert(SString &in, MultiMap *map)
    2828{
    2929        vector<XYZ_LOC> vertices;
     
    5555}
    5656
    57 int GenoConv_F90::addSegment(Model &m,vector<XYZ_LOC> &vertices,const XYZ_LOC &new_vertex,int recently_added)
     57int GenoConv_f90::addSegment(Model &m,vector<XYZ_LOC> &vertices,const XYZ_LOC &new_vertex,int recently_added)
    5858{
    5959        if (vertices.size()<1)
     
    7777}
    7878
    79 int GenoConv_F90::findVertexAt(vector<XYZ_LOC> &vertices,const XYZ_LOC &vertex)
     79int GenoConv_f90::findVertexAt(vector<XYZ_LOC> &vertices,const XYZ_LOC &vertex)
    8080{
    8181        for(int i=0;i<vertices.size();i++)
     
    8585
    8686
    87 int GenoConv_F90::addNewVertex(Model &m,vector<XYZ_LOC> &vertices,const XYZ_LOC &new_vertex)
     87int GenoConv_f90::addNewVertex(Model &m,vector<XYZ_LOC> &vertices,const XYZ_LOC &new_vertex)
    8888{
    8989        Part *p=new Part;
     
    110110}
    111111
    112 void GenoConv_F90::setColors(Model &m) //sets fixed (independent from genes) colors and widths on a model, purely for aesthetic purposes
     112void GenoConv_f90::setColors(Model &m) //sets fixed (independent from genes) colors and widths on a model, purely for aesthetic purposes
    113113{
    114114        //a rainbow on Joints: from the first one red, through middle green, to blue or violet - last
     
    145145}
    146146
    147 void GenoConv_F90::perturbPartLocations(Model &m) //deterministic "body noise", see APPLY_DETERMINISTIC_BODY_NOISE
     147void GenoConv_f90::perturbPartLocations(Model &m) //deterministic "body noise", see APPLY_DETERMINISTIC_BODY_NOISE
    148148{
    149149        for(int i=0;i<m.getPartCount();i++)
  • cpp/frams/genetics/f9/conv_f9.h

    r125 r139  
    2929
    3030// The f9->f0 converter
    31 class GenoConv_F90: public GenoConverter
     31class GenoConv_f90: public GenoConverter
    3232{
    3333public:
    34         GenoConv_F90();
     34        GenoConv_f90();
    3535
    36         //implementation GenoConverter method
     36        //implementation of the GenoConverter method
    3737        SString convert(SString &in, MultiMap *map);
    3838
  • cpp/frams/genetics/f9/oper_f9.h

    r120 r139  
    1818        int crossOver(char *&g1,char *&g2,float& chg1,float& chg2);
    1919        unsigned long style(const char *g, int pos);
    20         char* getSimplest() {return "R";}
     20        const char* getSimplest() {return "R";}
    2121
    2222        double mut_prob; //mutation probability
Note: See TracChangeset for help on using the changeset viewer.