Changeset 736 for cpp/frams


Ignore:
Timestamp:
02/17/18 19:02:07 (7 years ago)
Author:
Maciej Komosinski
Message:

Added the new "using_checkpoints" argument to genetic converters so they can now call Model.checkpoint() when desired, see conv_f1.cpp for an example

Location:
cpp/frams/genetics
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • cpp/frams/genetics/f4/conv_f4.cpp

    r726 r736  
    2323
    2424
    25 SString GenoConv_f40::convert(SString &in, MultiMap * map)
     25SString GenoConv_f40::convert(SString &in, MultiMap * map, bool using_checkpoints)
    2626{
    2727        int res;
    … …  
    4848
    4949
    50 SString GenoConv_F41_TestOnly::convert(SString &in, MultiMap * map)
     50SString GenoConv_F41_TestOnly::convert(SString &in, MultiMap * map, bool using_checkpoints)
    5151{
    5252        int res;

  • cpp/frams/genetics/f4/conv_f4.h

    r286 r736  
    2020public:
    2121        GenoConv_f40();
    22         SString convert(SString &in, MultiMap * map);
     22        SString convert(SString &in, MultiMap * map, bool using_checkpoints);
    2323};
    2424
    … …  
    2929public:
    3030        GenoConv_F41_TestOnly();
    31         SString convert(SString &in, MultiMap * map);
     31        SString convert(SString &in, MultiMap * map, bool using_checkpoints);
    3232};
    3333

  • cpp/frams/genetics/f9/conv_f9.cpp

    r664 r736  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
    … …  
    2525//const char* turtle_commandsZ_f9="0000-+";
    2626
    27 SString GenoConv_f90::convert(SString &in, MultiMap *map)
     27SString GenoConv_f90::convert(SString &in, MultiMap *map, bool using_checkpoints)
    2828{
    2929        vector<XYZ_LOC> vertices;

  • cpp/frams/genetics/f9/conv_f9.h

    r664 r736  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
    … …  
    3535
    3636        //implementation of the GenoConverter method
    37         SString convert(SString &in, MultiMap *map);
     37        SString convert(SString &in, MultiMap *map, bool using_checkpoints);
    3838
    3939protected:

  • cpp/frams/genetics/fF/conv_fF.cpp

    r667 r736  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
    … …  
    3636}
    3737
    38 SString GenoConv_fF0::convert(SString &in, MultiMap *map)
     38SString GenoConv_fF0::convert(SString &in, MultiMap *map, bool using_checkpoints)
    3939{
    4040        fF_growth_params gp;

  • cpp/frams/genetics/fF/conv_fF.h

    r667 r736  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
    … …  
    4040        ~GenoConv_fF0();
    4141        //implementation of the GenoConverter method
    42         SString convert(SString &in, MultiMap *map);
     42        SString convert(SString &in, MultiMap *map, bool using_checkpoints);
    4343
    4444protected:
Note: See TracChangeset for help on using the changeset viewer.