Changeset 779 for cpp/frams/genetics/fF

Timestamp:

05/11/18 23:42:04 (6 years ago)

Author:

Maciej Komosinski

Message:

Unified file names of all files involved in genetic conversions and operations so that they start with "f<format>_"

Location:

cpp/frams/genetics/fF

Files:

• fF_chamber3d.cpp (modified) (1 diff)
• fF_chamber3d.h (modified) (1 diff)
• fF_conv.cpp (moved) (moved from cpp/frams/genetics/fF/conv_fF.cpp) (1 diff)
• fF_conv.h (moved) (moved from cpp/frams/genetics/fF/conv_fF.h) (2 diffs)
• fF_oper.cpp (moved) (moved from cpp/frams/genetics/fF/oper_fF.cpp) (1 diff)
• fF_oper.h (moved) (moved from cpp/frams/genetics/fF/oper_fF.h) (1 diff)

cpp/frams/genetics/fF/fF_chamber3d.cpp

@@ -4 +4 @@
 
 #include "fF_chamber3d.h"
-#include "conv_fF.h"
+#include "fF_conv.h"
 #include <iostream>
 

cpp/frams/genetics/fF/fF_chamber3d.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef CHAMBER3D_H
-#define CHAMBER3D_H
+#ifndef _FF_CHAMBER3D_H_
+#define _FF_CHAMBER3D_H_
 
 struct fF_point;

cpp/frams/genetics/fF/fF_conv.cpp

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#include "conv_fF.h"
+#include "fF_conv.h"
 #include "fF_genotype.h"
 #include <common/nonstd_stl.h>

cpp/frams/genetics/fF/fF_conv.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef _CONV_FF_H_
-#define _CONV_FF_H_
+#ifndef _FF_CONV_H_
+#define _FF_CONV_H_
+
+
 
 #define fF_TOO_MUCH 0.75
@@ -56 +58 @@
 };
 
+
 #endif

cpp/frams/genetics/fF/fF_oper.cpp

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#include "oper_fF.h"
+#include "fF_oper.h"
 #include "fF_genotype.h"
 #include <common/nonstd.h> //randomN, rnd01

cpp/frams/genetics/fF/fF_oper.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef _GENOOPER_FF_H_
-#define _GENOOPER_FF_H_
+#ifndef _FF_OPER_H_
+#define _FF_OPER_H_
 
-#include "../oper_fx.h"
+#include "../genooperators.h"