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

Timestamp:

03/17/14 00:57:50 (9 years ago)

Author:

Maciej Komosinski

Message:

Changed cryptic double[4] into a meaningful struct

File:

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

cpp/frams/genetics/fF/conv_fF.h

@@ -24 +24 @@
 #include "fF_chamber3d.h"
 
+
+//A point on the surface of a chamber
+struct fF_point
+{
+        double x, y, z;
+        bool inside; //helper field used when computing whether this point is inside some chamber
+};
+
+
 // The f9->f0 converter
 class GenoConv_fF0 : public GenoConverter {
@@ -33 +42 @@
 
 protected:
-        double* cosines;
-        double* sines;
         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);
-        double** generate_points(fF_chamber3d *chamber, int which, double kx, double ky, double kz);
-        void fill_cos_and_sin();
+        fF_point* generate_points(fF_chamber3d *chamber, int which, double kx, double ky, double kz);
         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_);
+
+private:
+        double* cosines;
+        double* sines;
+        void precompute_cos_and_sin();
 };