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

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/fF_chamber3d.cpp (modified) (3 diffs)

cpp/frams/genetics/fF/fF_chamber3d.cpp

@@ -2 +2 @@
 // Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
 // Refer to http://www.framsticks.com/ for further information.
+
 #include "fF_chamber3d.h"
 #include "conv_fF.h"
@@ -8 +9 @@
 fF_chamber3d::~fF_chamber3d()
 {
-    for (int i = 0; i < SIZE; i++){
-        delete []points[i];
-    }
-    delete []points;
-}   
+        for (int i = 0; i < fF_SIZE; i++)
+                delete[] points[i];
+        delete[] points;
+}
 
 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)
+        float radius, float holeX, float holeY, float holeZ,
+        float vectorTfX, float vectorTfY, float vectorTfZ, float beta, float phi)
 {
-        points = NULL;
+        points = NULL;
         this->centerX = centerX;
         this->centerY = centerY;
@@ -30 +30 @@
         this->vectorTfZ = vectorTfZ;
         this->beta = beta;
-        this->phi = phi;                        
+        this->phi = phi;
 }