Changeset 966


Ignore:
Timestamp:
06/28/20 21:59:14 (2 weeks ago)
Author:
Maciej Komosinski
Message:

Cosmetic

Location:
cpp/frams/genetics
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/genetics/fH/fH_general.cpp

    r835 r966  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
     
    1010#include "fH_general.h"
    1111
    12 using namespace std;
    13 #undef max //this macro is not needed here and it clashes with numeric_limits<>::max()
     12using std::pair, std::to_string, std::numeric_limits;
    1413
    1514
     
    603602                        }
    604603                }
    605                 // if there was no neuron that could begin connection, then return warning
     604                // if there was no neuron that could begin a connection, then return warning
    606605                if (!beginneu)
    607606                {
     
    649648Pt3D fH_Builder::getNextDirection(int count, int number)
    650649{
    651         // In order to get evenly distributed sticks coming from the same Part method
    652         // uses algorithm for even distribution of points on a sphere. There are several
    653         // methods to perform this, usually they are iterative. This method introduced
     650        // In order to get evenly distributed sticks coming from the same Part, the method
     651        // uses an algorithm for even distribution of points on a sphere. There are several
     652        // methods to perform this, usually iterative. The method introduced
    654653        // below offers not fully accurate, yet quite satisfying results. This is
    655         // RSZ method (Rakhmanov, Saff and Zhou method), with use of the golden angle.
    656         // This method is based on distribution of points along spiral that covers sphere
    657         // surface.
    658 
    659         // Following method works partially on spherical coordinates (r and theta is used).
     654        // the RSZ method (Rakhmanov, Saff and Zhou) with the use of the golden angle.
     655        // This method is based on the distribution of points along a spiral that covers
     656        // the sphere surface.
     657
     658        // The following method works partially on spherical coordinates (r and theta is used).
    660659        // The Z coordinate is from Cartesian coordinate system. The golden angle is used
    661         // to "iterate" along spiral, while Z coordinate is used to move down the
     660        // to "iterate" along the spiral, while the Z coordinate is used to move down the
    662661        // sphere.
    663662
  • cpp/frams/genetics/fH/fH_general.h

    r821 r966  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
     
    3939
    4040/**
    41  * Base class for all kinds of handles in fH encoding.Each line of fH genotype
     41 * Base class for all kinds of handles in fH encoding. Each line of fH genotype
    4242 * describes a handle. Handles can be divided into joints, neurons and
    4343 * connections. Every handle is described with 2 vectors of 'dimensions' values.
     
    292292
    293293        /**
    294          * Processes single line of genotype. This line should begin with
    295          * "j:", "n:" or "c:". Otherwise it will be considered as error.
     294         * Processes a single line of genotype. This line should begin with
     295         * "j:", "n:" or "c:". Otherwise it will be considered an error.
    296296         * @param line line of a genotype
    297297         * @param linenumber number of line in genotype, required for error messages
  • cpp/frams/genetics/genman.cpp

    r965 r966  
    572572        delete[] styletab;
    573573        latex += "}"; //for color (it was used at least once)
     574        if (style & GENSTYLE_INVALID) latex += "}";
    574575        if (style & GENSTYLE_BOLD) latex += "}";
    575576        if (style & GENSTYLE_ITALIC) latex += "}";
Note: See TracChangeset for help on using the changeset viewer.