Changeset 667 for cpp/frams/genetics/fF/fF_chamber3d.cpp

Timestamp:

06/07/17 12:01:16 (8 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/fF_chamber3d.cpp (modified) (3 diffs)

cpp/frams/genetics/fF/fF_chamber3d.cpp

@@ -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.
 
@@ -7 +7 @@
 #include <iostream>
 
-fF_chamber3d::fF_chamber3d(float centerX, float centerY, float centerZ,
-        float radius, float holeX, float holeY, float holeZ,
-        float vectorTfX, float vectorTfY, float vectorTfZ, float beta, float phi)
+fF_chamber3d::fF_chamber3d(double centerX, double centerY, double centerZ,
+        double radius_x, double radius_y, double radius_z, double holeX, double holeY, double holeZ,
+        double vectorTfX, double vectorTfY, double vectorTfZ, double beta, double phi)
 {
         points = NULL;
@@ -15 +15 @@
         this->centerY = centerY;
         this->centerZ = centerZ;
-        this->radius = radius;
+        this->radius_x = radius_x;
+        this->radius_y = radius_y;
+        this->radius_z = radius_z;
         this->holeX = holeX;
         this->holeY = holeY;