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

Timestamp:

03/15/14 02:30:20 (10 years ago)

Author:

Maciej Komosinski

Message:

Renamed #defines that conflicted with system-wide defines for Windows (added fF_ prefix), updated ranges for scaling parameters, updated the simplest genotype, formatted sources

File:

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

cpp/frams/genetics/fF/conv_fF.h

@@ -6 +6 @@
 #define _CONV_FF_H_
 
-#define TOO_MUCH 0.75
-#define TOO_LITTLE 0.10
+#define fF_TOO_MUCH 0.75
+#define fF_TOO_LITTLE 0.10
 
-#define HOLE_RADIUS 0.05f
-#define LONGITUDE_NUM 69
+#define fF_HOLE_RADIUS 0.05f
+#define fF_LONGITUDE_NUM 69
 
-#define LATITUDE_NUM ((LONGITUDE_NUM - 1)*2)
-#define AMOUNT ((LATITUDE_NUM)*(LONGITUDE_NUM))
+#define fF_LATITUDE_NUM ((fF_LONGITUDE_NUM - 1)*2)
+#define fF_AMOUNT ((fF_LATITUDE_NUM)*(fF_LONGITUDE_NUM))
 
-#define THICK_RATIO 0.95
+#define fF_THICK_RATIO 0.95
 
-#define SIZE LONGITUDE_NUM * LATITUDE_NUM + LATITUDE_NUM
+#define fF_SIZE fF_LONGITUDE_NUM * fF_LATITUDE_NUM + fF_LATITUDE_NUM
 
 #include <frams/util/multimap.h>
@@ -25 +25 @@
 
 // The f9->f0 converter
-
 class GenoConv_fF0 : public GenoConverter {
 public:
-    GenoConv_fF0();
-    ~GenoConv_fF0();
-    //implementation of the GenoConverter method
-    SString convert(SString &in, MultiMap *map);
+        GenoConv_fF0();
+        ~GenoConv_fF0();
+        //implementation of the GenoConverter method
+        SString convert(SString &in, MultiMap *map);
 
 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();
-    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_);
+        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();
+        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_);
 };
 
 #endif
-
-