Ignore:
Timestamp:
06/07/17 12:01:16 (5 years ago)
Author:
Maciej Komosinski
Message:
  • fF foraminifera encoding supports scaling (radius) of the initial chamber (three new parameters added: radii for x,y,z)
  • mutation ignores these three parameters
  • float -> double for consistency everywhere
File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/genetics/fF/conv_fF.h

    r286 r667  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
     
    99#define fF_TOO_LITTLE 0.10
    1010
    11 #define fF_HOLE_RADIUS 0.05f
     11#define fF_HOLE_RADIUS 0.05
    1212#define fF_LONGITUDE_NUM 69
    1313
     
    4343
    4444protected:
    45         void createSphere(int ktora, fF_chamber3d **chambers, double radius, double div_radius_length, double div_vector_length,
    46                 double alpha, double gamma, double kx, double ky, double kz);
    47         fF_point* generate_points(fF_chamber3d *chamber, int which, double kx, double ky, double kz);
     45        void createSphere(int ktora, fF_chamber3d **chambers, double radius0x, double radius0y, double radius0z, double translation, double alpha, double gamma, double kx, double ky, double kz);
     46        fF_point* generate_points(fF_chamber3d *chamber);
    4847        double dist(double x1, double y1, double z1, double x2, double y2, double z2);
    49         void search_hid(int nr, fF_chamber3d **spheres, double kx_, double ky_, double kz_);
    50         int find_hole(int which, double x, double y, double z, fF_chamber3d **chambers, double kx_, double ky_, double kz_);
    51 
     48        void search_hid(int nr, fF_chamber3d **spheres);
     49        int find_hole(int which, double x, double y, double z, fF_chamber3d **chambers);
     50        double get_radius(double prev_radius, double scale, double radius0);
    5251private:
    5352        double* cosines;
Note: See TracChangeset for help on using the changeset viewer.