Changeset 748


Ignore:
Timestamp:
02/28/18 19:41:33 (2 years ago)
Author:
Maciej Komosinski
Message:

Configured and activated the new "fn" genetic representation

Location:
cpp/frams
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/Makefile-SDK-files

    r732 r748  
    88GENMANFF=frams/genetics/fF/oper_fF.o
    99GENMANFT=frams/genetics/fT/oper_fTest.o
     10GENMANFN=frams/genetics/fn/oper_fn.o
    1011
    1112CONVF1=frams/genetics/f1/conv_f1.o
     
    1314CONVF9=frams/genetics/f9/conv_f9.o
    1415CONVFF=frams/genetics/fF/conv_fF.o frams/genetics/fF/fF_genotype.o frams/genetics/fF/fF_chamber3d.o
     16CONVFN=frams/genetics/fn/conv_fn.o
    1517
    16 GENOCONV_SDK_OBJS=frams/genetics/defgenoconv.o frams/vm/classes/genoobj.o frams/model/autoname.o $(CONVF1) $(CONVF4) $(CONVF9) $(CONVFF)
    17 GENMAN_SDK_OBJS=$(GENMAN_COMMON_OBJS) $(GENMANF4) $(GENMANF9) $(GENMANFF) $(GENMANFT)
     18GENOCONV_SDK_OBJS=frams/genetics/defgenoconv.o frams/vm/classes/genoobj.o frams/model/autoname.o $(CONVF1) $(CONVF4) $(CONVF9) $(CONVFF) $(CONVFN)
     19GENMAN_SDK_OBJS=$(GENMAN_COMMON_OBJS) $(GENMANF4) $(GENMANF9) $(GENMANFF) $(GENMANFT) $(GENMANFN)
    1820
    1921GENMAN_COMMON_OBJS=frams/genetics/genman.o frams/param/mutableparam.o frams/param/mutparamlist.o frams/neuro/geneticneuroparam.o frams/neuro/neurolibparam.o
  • cpp/frams/genetics/defgenoconv.cpp

    r286 r748  
    4040#include "fF/conv_fF.h"
    4141#endif
     42#ifdef USE_GENCONV_fn0
     43#include "fn/conv_fn.h"
     44#endif
    4245
    4346void DefaultGenoConvManager::addDefaultConverters()
     
    7679        addConverter(new GenoConv_fF0);
    7780#endif
     81#ifdef USE_GENCONV_fn0
     82        addConverter(new GenoConv_fn0);
     83#endif
    7884
    7985        param.updatetab();
  • cpp/frams/genetics/gen-config-SDK.h

    r288 r748  
    2020#define USE_GENCONV_f90
    2121#define USE_GENCONV_fF0
     22#define USE_GENCONV_fn0
    2223
    2324//#define USE_GENMAN_f0
     
    3031#define USE_GENMAN_fF
    3132#define USE_GENMAN_fT
    32 
     33#define USE_GENMAN_fn
  • cpp/frams/genetics/genman.cpp

    r715 r748  
    4747#ifdef USE_GENMAN_fF
    4848#include "fF/oper_fF.h"
     49#endif
     50#ifdef USE_GENMAN_fn
     51#include "fn/oper_fn.h"
    4952#endif
    5053#ifdef USE_GENMAN_fT
     
    143146#ifdef USE_GENMAN_fF
    144147        oper_fx_list.push_back(new GenoOper_fF);
     148#endif
     149#ifdef USE_GENMAN_fn
     150        oper_fx_list.push_back(new GenoOper_fn);
    145151#endif
    146152#ifdef USE_GENMAN_fT
Note: See TracChangeset for help on using the changeset viewer.