Changeset 667 for cpp/frams/genetics/fF/conv_fF.h

Timestamp:

06/07/17 12:01:16 (7 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:

• cpp/frams/genetics/fF/conv_fF.h (modified) (3 diffs)

cpp/frams/genetics/fF/conv_fF.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -9 +9 @@
 #define fF_TOO_LITTLE 0.10
 
-#define fF_HOLE_RADIUS 0.05f
+#define fF_HOLE_RADIUS 0.05
 #define fF_LONGITUDE_NUM 69
 
@@ -43 +43 @@
 
 protected:
-        void createSphere(int ktora, fF_chamber3d **chambers, double radius, double div_radius_length, double div_vector_length,
-                double alpha, double gamma, double kx, double ky, double kz);
-        fF_point* generate_points(fF_chamber3d *chamber, int which, double kx, double ky, double kz);
+        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);
+        fF_point* generate_points(fF_chamber3d *chamber);
         double dist(double x1, double y1, double z1, double x2, double y2, double z2);
-        void search_hid(int nr, fF_chamber3d **spheres, double kx_, double ky_, double kz_);
-        int find_hole(int which, double x, double y, double z, fF_chamber3d **chambers, double kx_, double ky_, double kz_);
-
+        void search_hid(int nr, fF_chamber3d **spheres);
+        int find_hole(int which, double x, double y, double z, fF_chamber3d **chambers);
+        double get_radius(double prev_radius, double scale, double radius0);
 private:
         double* cosines;