Changeset 779


Ignore:
Timestamp:
05/11/18 23:42:04 (18 months ago)
Author:
Maciej Komosinski
Message:

Unified file names of all files involved in genetic conversions and operations so that they start with "f<format>_"

Location:
cpp/frams
Files:
8 edited
22 moved

Legend:

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

    r759 r779  
    44ALL_DIRS={common,frams,frams/canvas,frams/config,common/loggers,frams/genetics,frams/genetics/f0,frams/genetics/f1,frams/genetics/f2,frams/genetics/f3,frams/genetics/f4,frams/genetics/f5,frams/genetics/f6,frams/genetics/f7,frams/genetics/f8,frams/genetics/f9,frams/genetics/fn,frams/genetics/fF,frams/genetics/fT,frams/model,frams/neuro,frams/neuro/impl,frams/param,frams/test,frams/util,frams/vm/classes,common/virtfile,frams/_demos,frams/model/geometry,frams/_demos/geometry,frams/model/similarity,frams/model/similarity/SVD}
    55
    6 GENMANF4=frams/genetics/f4/oper_f4.o
    7 GENMANF9=frams/genetics/f9/oper_f9.o
    8 GENMANFF=frams/genetics/fF/oper_fF.o
    9 GENMANFT=frams/genetics/fT/oper_fTest.o
    10 GENMANFN=frams/genetics/fn/oper_fn.o
     6GENMANF4=frams/genetics/f4/f4_oper.o
     7GENMANF9=frams/genetics/f9/f9_oper.o
     8GENMANFF=frams/genetics/fF/fF_oper.o
     9GENMANFT=frams/genetics/fT/fTest_oper.o
     10GENMANFN=frams/genetics/fn/fn_oper.o
    1111
    12 CONVF1=frams/genetics/f1/conv_f1.o frams/genetics/geneprops.o
    13 CONVF4=frams/genetics/f4/conv_f4.o frams/genetics/f4/f4_general.o frams/genetics/geneprops.o
    14 CONVF9=frams/genetics/f9/conv_f9.o
    15 CONVFF=frams/genetics/fF/conv_fF.o frams/genetics/fF/fF_genotype.o frams/genetics/fF/fF_chamber3d.o
    16 CONVFN=frams/genetics/fn/conv_fn.o
     12CONVF1=frams/genetics/f1/f1_conv.o frams/genetics/geneprops.o
     13CONVF4=frams/genetics/f4/f4_conv.o frams/genetics/f4/f4_general.o frams/genetics/geneprops.o
     14CONVF9=frams/genetics/f9/f9_conv.o
     15CONVFF=frams/genetics/fF/fF_conv.o frams/genetics/fF/fF_genotype.o frams/genetics/fF/fF_chamber3d.o
     16CONVFN=frams/genetics/fn/fn_conv.o
    1717
    1818# $(sort - remove duplicates
     
    2222GENMAN_COMMON_OBJS=frams/genetics/genman.o frams/param/mutableparam.o frams/param/mutparamlist.o frams/neuro/geneticneuroparam.o frams/neuro/neurolibparam.o
    2323
    24 SDK_OBJS=frams/util/list.o frams/util/advlist.o frams/param/param.o frams/util/sstring.o frams/util/sstringutils.o frams/util/3d.o frams/vm/classes/3dobject.o frams/model/model.o frams/model/modelparts.o frams/neuro/neurolibrary.o frams/genetics/geno.o frams/genetics/genoconv.o frams/util/extvalue.o frams/vm/classes/collectionobj.o frams/util/hashtable.o common/log.o common/stl-util.o common/nonstd_stdio.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o common/loggers/loggers.o frams/param/paramobj.o frams/genetics/oper_fx.o common/nonstd_math.o frams/util/validitychecks.o common/Convert.o frams/util/rndutil.o common/virtfile/stringfile.o
     24SDK_OBJS=frams/util/list.o frams/util/advlist.o frams/param/param.o frams/util/sstring.o frams/util/sstringutils.o frams/util/3d.o frams/vm/classes/3dobject.o frams/model/model.o frams/model/modelparts.o frams/neuro/neurolibrary.o frams/genetics/geno.o frams/genetics/genoconv.o frams/util/extvalue.o frams/vm/classes/collectionobj.o frams/util/hashtable.o common/log.o common/stl-util.o common/nonstd_stdio.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o common/loggers/loggers.o frams/param/paramobj.o frams/genetics/genooperators.o common/nonstd_math.o frams/util/validitychecks.o common/Convert.o frams/util/rndutil.o common/virtfile/stringfile.o
    2525
    2626GEOMETRY_OBJS=frams/model/geometry/meshbuilder.o frams/model/geometry/modelgeometryinfo.o frams/model/geometry/geometryutils.o
  • cpp/frams/_demos/genooper_test_fTest.cpp

    r319 r779  
    33// See LICENSE.txt for details.
    44
    5 #include <frams/genetics/fT/oper_fTest.h>
     5#include <frams/genetics/fT/fTest_oper.h>
    66
    77GenoOper_fTest gft;
  • cpp/frams/genetics/defgenoconv.cpp

    r748 r779  
    88
    99#ifdef USE_GENCONV_f10
    10 #include "f1/conv_f1.h"
     10#include "f1/f1_conv.h"
    1111#endif
    1212#ifdef USE_GENCONV_f20
    13 #include "f2/conv_f2.h"
     13#include "f2/f2_conv.h"
    1414#endif
    1515#ifdef USE_GENCONV_f32
    16 #include "f3/conv_f3.h"
     16#include "f3/f3_conv.h"
    1717#endif
    1818#ifdef USE_GENCONV_f40
    19 #include "f4/conv_f4.h"
     19#include "f4/f4_conv.h"
    2020#endif
    2121#ifdef USE_GENCONV_f41_TEST
    22 #include "f4/conv_f4.h"
     22#include "f4/f4_conv.h"
    2323#endif
    2424#ifdef USE_GENCONV_f50
    25 #include "f5/conv_f5.h"
     25#include "f5/f5_conv.h"
    2626#endif
    2727#ifdef USE_GENCONV_f60
    28 #include "f6/geno_f6.h"
     28#include "f6/f6_geno.h"
    2929#endif
    3030#ifdef USE_GENCONV_f70
    31 #include "f7/conv_f7.h"
     31#include "f7/f7_conv.h"
    3232#endif
    3333#ifdef USE_GENCONV_f81     
    34 #include "f8/conv_f8tof1.h"
     34#include "f8/f8_convtof1.h"
    3535#endif
    3636#ifdef USE_GENCONV_f90
    37 #include "f9/conv_f9.h"
     37#include "f9/f9_conv.h"
    3838#endif
    3939#ifdef USE_GENCONV_fF0
    40 #include "fF/conv_fF.h"
     40#include "fF/fF_conv.h"
    4141#endif
    4242#ifdef USE_GENCONV_fn0
    43 #include "fn/conv_fn.h"
     43#include "fn/fn_conv.h"
    4444#endif
    4545
  • cpp/frams/genetics/f1/f1_conv.cpp

    r778 r779  
    33// See LICENSE.txt for details.
    44
    5 #include "conv_f1.h"
     5#include "f1_conv.h"
    66#include <common/nonstd_stl.h>
    77#include <common/log.h>
  • cpp/frams/genetics/f1/f1_conv.h

    r778 r779  
    33// See LICENSE.txt for details.
    44
    5 #ifndef _CONV_F1_H
    6 #define _CONV_F1_H
     5#ifndef _F1_CONV_H_
     6#define _F1_CONV_H_
    77
    88#include <frams/genetics/genoconv.h>
  • cpp/frams/genetics/f4/f4_conv.cpp

    r778 r779  
    77// 2018, Grzegorz Latosinski, added support for new API for neuron types and their properties
    88
    9 #include "conv_f4.h"
     9#include "f4_conv.h"
    1010#include <common/log.h>
    11 #include "../oper_fx.h" //for GENOPER_OK constant
     11#include "../genooperators.h" //for GENOPER_OK constant
    1212
    1313#ifdef DMALLOC
  • cpp/frams/genetics/f4/f4_conv.h

    r778 r779  
    77// 2018, Grzegorz Latosinski, added support for new API for neuron types and their properties
    88
    9 #ifndef _CONV_F4_H_
    10 #define _CONV_F4_H_
     9#ifndef _F4_CONV_H_
     10#define _F4_CONV_H_
    1111
    1212#include <frams/model/model.h>
  • cpp/frams/genetics/f4/f4_general.cpp

    r774 r779  
    77
    88#include "f4_general.h"
    9 #include "../oper_fx.h" //for GENOPER_ constants
     9#include "../genooperators.h" //for GENOPER_ constants
    1010#include <common/nonstd_stl.h>
    1111#include <common/log.h>
  • cpp/frams/genetics/f4/f4_oper.cpp

    r778 r779  
    77// 2018, Grzegorz Latosinski, added support for new API for neuron types and their properties
    88
    9 #include "oper_f4.h"
     9#include "f4_oper.h"
    1010#include <frams/util/sstring.h>
    1111#include <common/log.h>
  • cpp/frams/genetics/f4/f4_oper.h

    r778 r779  
    66// Copyright (C) since 2001 Maciej Komosinski
    77
    8 #ifndef _GENO_F4_H_
    9 #define _GENO_F4_H_
     8#ifndef _F4_OPER_H_
     9#define _F4_OPER_H_
    1010
    1111#include <stdio.h>
    1212#include "f4_general.h"
    1313#include "common/nonstd.h"
    14 #include "../oper_fx.h"
     14#include "../genooperators.h"
    1515#include <frams/param/param.h>
    1616
  • cpp/frams/genetics/f9/f9_conv.cpp

    r778 r779  
    33// See LICENSE.txt for details.
    44
    5 #include "conv_f9.h"
     5#include "f9_conv.h"
    66#include <frams/model/model.h>
    77#include <string.h>
  • cpp/frams/genetics/f9/f9_conv.h

    r778 r779  
    33// See LICENSE.txt for details.
    44
    5 #ifndef _CONV_F9_H_
    6 #define _CONV_F9_H_
     5#ifndef _F9_CONV_H_
     6#define _F9_CONV_H_
    77
    88#include <ctype.h>
  • cpp/frams/genetics/f9/f9_oper.cpp

    r778 r779  
    33// See LICENSE.txt for details.
    44
    5 #include "oper_f9.h"
    6 #include "conv_f9.h"
     5#include "f9_oper.h"
     6#include "f9_conv.h"
    77#include <common/nonstd.h> //randomN, rnd01
    88
  • cpp/frams/genetics/f9/f9_oper.h

    r778 r779  
    33// See LICENSE.txt for details.
    44
    5 #ifndef _GENOOPER_F9_H_
    6 #define _GENOOPER_F9_H_
     5#ifndef _F9_OPER_H_
     6#define _F9_OPER_H_
    77
    8 #include "../oper_fx.h"
     8#include "../genooperators.h"
    99
    1010
  • cpp/frams/genetics/fF/fF_chamber3d.cpp

    r667 r779  
    44
    55#include "fF_chamber3d.h"
    6 #include "conv_fF.h"
     6#include "fF_conv.h"
    77#include <iostream>
    88
  • cpp/frams/genetics/fF/fF_chamber3d.h

    r667 r779  
    33// See LICENSE.txt for details.
    44
    5 #ifndef CHAMBER3D_H
    6 #define CHAMBER3D_H
     5#ifndef _FF_CHAMBER3D_H_
     6#define _FF_CHAMBER3D_H_
    77
    88struct fF_point;
  • cpp/frams/genetics/fF/fF_conv.cpp

    r778 r779  
    33// See LICENSE.txt for details.
    44
    5 #include "conv_fF.h"
     5#include "fF_conv.h"
    66#include "fF_genotype.h"
    77#include <common/nonstd_stl.h>
  • cpp/frams/genetics/fF/fF_conv.h

    r778 r779  
    33// See LICENSE.txt for details.
    44
    5 #ifndef _CONV_FF_H_
    6 #define _CONV_FF_H_
     5#ifndef _FF_CONV_H_
     6#define _FF_CONV_H_
     7
     8
    79
    810#define fF_TOO_MUCH 0.75
     
    5658};
    5759
     60
    5861#endif
  • cpp/frams/genetics/fF/fF_oper.cpp

    r778 r779  
    33// See LICENSE.txt for details.
    44
    5 #include "oper_fF.h"
     5#include "fF_oper.h"
    66#include "fF_genotype.h"
    77#include <common/nonstd.h> //randomN, rnd01
  • cpp/frams/genetics/fF/fF_oper.h

    r778 r779  
    33// See LICENSE.txt for details.
    44
    5 #ifndef _GENOOPER_FF_H_
    6 #define _GENOOPER_FF_H_
     5#ifndef _FF_OPER_H_
     6#define _FF_OPER_H_
    77
    8 #include "../oper_fx.h"
     8#include "../genooperators.h"
    99
    1010
  • cpp/frams/genetics/fT/fTest_oper.cpp

    r778 r779  
    33// See LICENSE.txt for details.
    44
    5 #include "oper_fTest.h"
     5#include "fTest_oper.h"
    66#include <common/nonstd.h> //randomN, rnd01
    77
  • cpp/frams/genetics/fT/fTest_oper.h

    r778 r779  
    33// See LICENSE.txt for details.
    44
    5 #ifndef _GENOOPER_FTEST_H_
    6 #define _GENOOPER_FTEST_H_
     5#ifndef _FTEST_OPER_H_
     6#define _FTEST_OPER_H_
    77
    8 #include "../oper_fx.h"
     8#include "../genooperators.h"
    99
    1010/** \file */
  • cpp/frams/genetics/fn/fn_conv.cpp

    r778 r779  
    33// See LICENSE.txt for details.
    44
    5 #include "conv_fn.h"
     5#include "fn_conv.h"
    66#include <frams/vm/classes/collectionobj.h>
    77
  • cpp/frams/genetics/fn/fn_conv.h

    r778 r779  
    33// See LICENSE.txt for details.
    44
    5 #ifndef _CONV_Fn_H_
    6 #define _CONV_Fn_H_
     5#ifndef _Fn_CONV_H_
     6#define _Fn_CONV_H_
    77
    88#include <frams/genetics/genoconv.h>
  • cpp/frams/genetics/fn/fn_oper.cpp

    r778 r779  
    33// See LICENSE.txt for details.
    44
    5 #include "oper_fn.h"
    6 #include "conv_fn.h"
     5#include "fn_oper.h"
     6#include "fn_conv.h"
    77#include <common/nonstd.h> //randomN, rnd01
    88
  • cpp/frams/genetics/fn/fn_oper.h

    r778 r779  
    33// See LICENSE.txt for details.
    44
    5 #ifndef _GENOOPER_Fn_H_
    6 #define _GENOOPER_Fn_H_
     5#ifndef _Fn_OPER_H_
     6#define _Fn_OPER_H_
    77
    8 #include "../oper_fx.h"
     8#include "../genooperators.h"
    99
    1010
  • cpp/frams/genetics/genman.cpp

    r768 r779  
    1919
    2020#ifdef USE_GENMAN_f0
    21 #include "f0/oper_f0.h"
     21#include "f0/f0_oper.h"
    2222#endif
    2323#ifdef USE_GENMAN_f0FUZZY
    24 #include "f0/oper_f0Fuzzy.h"
     24#include "f0/f0Fuzzy_oper.h"
    2525#endif
    2626#ifdef USE_GENMAN_f1
    27 #include "f1/oper_f1.h"
     27#include "f1/f1_oper.h"
    2828#endif
    2929#ifdef USE_GENMAN_f2
    30 #include "f2/oper_f2.h"
     30#include "f2/f2_oper.h"
    3131#endif
    3232#ifdef USE_GENMAN_f2
    33 #include "f3/oper_f3.h"
     33#include "f3/f3_oper.h"
    3434#endif
    3535#ifdef USE_GENMAN_f4
    36 #include "f4/oper_f4.h"
     36#include "f4/f4_oper.h"
    3737#endif
    3838#ifdef USE_GENMAN_f5
    39 #include "f5/oper_f5.h"
     39#include "f5/f5_oper.h"
    4040#endif
    4141#ifdef USE_GENMAN_f6
    42 #include "f6/oper_f6.h"
     42#include "f6/f6_oper.h"
    4343#endif
    4444#ifdef USE_GENMAN_f7
    45 #include "f7/oper_f7.h"
     45#include "f7/f7_oper.h"
    4646#endif
    4747#ifdef USE_GENMAN_f8
    48 #include "f8/oper_f8.h"
     48#include "f8/f8_oper.h"
    4949#endif
    5050#ifdef USE_GENMAN_f9
    51 #include "f9/oper_f9.h"
     51#include "f9/f9_oper.h"
    5252#endif
    5353#ifdef USE_GENMAN_fF
    54 #include "fF/oper_fF.h"
     54#include "fF/fF_oper.h"
    5555#endif
    5656#ifdef USE_GENMAN_fn
    57 #include "fn/oper_fn.h"
     57#include "fn/fn_oper.h"
    5858#endif
    5959#ifdef USE_GENMAN_fT
    60 #include "fT/oper_fTest.h"
     60#include "fT/fTest_oper.h"
    6161#endif
    6262
  • cpp/frams/genetics/genman.h

    r532 r779  
    1212#include <frams/neuro/geneticneuroparam.h>
    1313#include "geno.h"
    14 #include "oper_fx.h"
     14#include "genooperators.h"
    1515
    1616#define GENSTYLE_COMMENT GENSTYLE_RGBS(0,150,0,GENSTYLE_BOLD)
  • cpp/frams/genetics/genooperators.cpp

    r778 r779  
    44
    55#include <ctype.h>  //isupper()
    6 #include "oper_fx.h"
     6#include "genooperators.h"
    77#include <common/log.h>
    88#include <common/nonstd_math.h>
Note: See TracChangeset for help on using the changeset viewer.