Changeset 81 for cpp/gdk/defgenoconv.cpp


Ignore:
Timestamp:
02/08/13 03:29:17 (12 years ago)
Author:
Maciej Komosinski
Message:

improved parsing of properties (e.g. in f0 genotypes)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • cpp/gdk/defgenoconv.cpp

    r66 r81  
    11#include "defgenoconv.h"
    22
    3 #include "gen-config.h"
     3#include GEN_CONFIG_FILE
    44
    55#ifdef USE_GENCONV_F10
    … …  
    2929#ifdef USE_GENCONV_F81
    3030#include "conv_f8tof1.h"
     31#endif
     32#ifdef USE_GENCONV_F90
     33#include "conv_f9.h"
    3134#endif
    3235
    … …  
    5861#endif
    5962#ifdef USE_GENCONV_F81
    60 GenoConv_F8ToF1 *gc81=new GenoConv_F8ToF1();
    61 GenoConv_F8ToF1::staticpar=gc81->par; //a trick so that the simulator can see this param
    62 addConverter(gc81);
     63addConverter(new GenoConv_F8ToF1());
     64#endif
     65#ifdef USE_GENCONV_F90
     66addConverter(new GenoConv_F90);
    6367#endif
    6468
Note: See TracChangeset for help on using the changeset viewer.