Changeset 671 for cpp/frams/genetics/f1/conv_f1.h

Timestamp:

08/18/17 15:24:59 (6 years ago)

Author:

Maciej Komosinski

Message:

Unified property names of f1 and f4; improved docs; 3.141 -> M_PI

File:

• cpp/frams/genetics/f1/conv_f1.h (modified) (4 diffs)

cpp/frams/genetics/f1/conv_f1.h

@@ -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.
 
@@ -11 +11 @@
 struct F1Props
 {
-        double dlug,skr,masa,tarcie,ruch,asym,odpor,wchl,rot,energ;
-        double bendrange;
-        int resetrange;
-        double grub,cred,cgreen,cblue;
-        void wykluczanie();
+        double length, curvedness, weight, friction, muscle_power, assimilation, stamina, ingestion, twist, energy;
+        double muscle_bend_range;
+        bool muscle_reset_range;
+        double visual_size, cred, cgreen, cblue;
+        void normalizeBiol4();
 };
 
@@ -49 +49 @@
  Another example:
 
- "X[G][-1:2.3][-2:3.4]" - The first neuron is the standalone G receptor. Other neuron can use its output 
+ "X[G][-1:2.3][-2:3.4]" - The first neuron is the standalone G receptor. Other neuron can use its output
  signal by specifying it as regular input ("-1:2.3" and "-2:3.4"). This NN contains 3 neurons.
  \image html nn-ex3.gif
@@ -57 +57 @@
  Adding another neuron with "G" input will add another gyroscope object. This NN contains 4 neurons
  (or 2 neurons if you try it in Framsticks v1).
-  \image html nn-ex4.gif
- 
-*/
-class GenoConv_f1: public GenoConverter
+ \image html nn-ex4.gif
+
+ */
+class GenoConv_f1 : public GenoConverter
 {
 public:
-GenoConv_f1()
+        GenoConv_f1()
         {
-        name="Recursive encoding";
-        in_format='1';
-        mapsupport=1;
+                name = "Recursive encoding";
+                in_format = '1';
+                mapsupport = 1;
         }
-SString convert(SString &i,MultiMap *map);
-~GenoConv_f1() {}
+        SString convert(SString &i, MultiMap *map);
+        ~GenoConv_f1() {}
 };