Changeset 288


Ignore:
Timestamp:
01/06/15 01:47:03 (5 years ago)
Author:
Maciej Komosinski
Message:

GDK->SDK, gdk_test.cpp -> genomanipulation.cpp

Location:
cpp/frams
Files:
4 edited
12 moved

Legend:

Unmodified
Added
Removed
  • cpp/frams/Makefile-SDK

    r269 r288  
    11#
    2 # Framsticks GDK makefile
     2# Framsticks SDK makefile
    33#
    44
    5 include frams/Makefile-GDK-files
     5include frams/Makefile-SDK-files
    66
    7 GDK_TESTS=genoconv_test gdk_test geno_test genooper_test genooper_test_fTest neuro_test loader_test serial_test multiline_f0_test f0_variants_test full_props shapeconvert part_shapes neuro_layout_test geometry_apices_test geometry_info_test geometry_surface_test geometry_volume_test
     7SDK_TESTS=genoconv_test genomanipulation geno_test genooper_test genooper_test_fTest neuro_test loader_test serial_test multiline_f0_test f0_variants_test full_props shapeconvert part_shapes neuro_layout_test geometry_apices_test geometry_info_test geometry_surface_test geometry_volume_test
    88
    9 gdk_tests: $(GDK_TESTS)
     9sdk_tests: $(SDK_TESTS)
    1010
    11 GDK_BUILD_CONFIG= -include frams/config/gdk_build_config.h
    12 CXXFLAGS= -I$(CURDIR) -std=gnu++11 -DLINUX $(GDK_BUILD_CONFIG) -Wno-parentheses -Wno-overloaded-virtual -Wno-format -g
     11SDK_BUILD_CONFIG= -include frams/config/sdk_build_config.h
     12CXXFLAGS= -I$(CURDIR) -std=gnu++11 -DLINUX $(SDK_BUILD_CONFIG) -Wno-parentheses -Wno-overloaded-virtual -Wno-format -g
    1313
    1414#############################################
    1515
    16 gdk_test: $(GDK_TEST_OBJS)
    17         $(CXX) $(GDK_TEST_OBJS) $(LDFLAGS) -o $@
     16genomanipulation: $(GENOMANIPULATION_OBJS)
     17        $(CXX) $(GENOMANIPULATION_OBJS) $(LDFLAGS) -o $@
    1818
    1919genoconv_test: $(GENOCONV_TEST_OBJS)
     
    7171#############################################
    7272
    73 ALL_OBJS=$(GDK_TEST_OBJS) $(GENOCONV_TEST_OBJS) $(GENO_TEST_OBJS) $(NEURO_TEST_OBJS) $(LOADER_TEST_OBJS) $(SERIAL_TEST_OBJS) $(MULTILINE_F0_OBJS) $(F0_VARIANTS_OBJS) $(FULL_PROPS_OBJS) $(PART_SHAPES_OBJS) $(NEURO_LAYOUT_TEST_OBJS) $(GENOOPER_TEST_OBJS) $(GEOMETRY_APICES_TEST_OBJS) $(GEOMETRY_INFO_TEST_OBJS) $(GEOMETRY_SURFACE_TEST_OBJS) $(GEOMETRY_VOLUME_TEST_OBJS)
     73ALL_OBJS=$(GENOMANIPULATION_OBJS) $(GENOCONV_TEST_OBJS) $(GENO_TEST_OBJS) $(NEURO_TEST_OBJS) $(LOADER_TEST_OBJS) $(SERIAL_TEST_OBJS) $(MULTILINE_F0_OBJS) $(F0_VARIANTS_OBJS) $(FULL_PROPS_OBJS) $(PART_SHAPES_OBJS) $(NEURO_LAYOUT_TEST_OBJS) $(GENOOPER_TEST_OBJS) $(GEOMETRY_APICES_TEST_OBJS) $(GEOMETRY_INFO_TEST_OBJS) $(GEOMETRY_SURFACE_TEST_OBJS) $(GEOMETRY_VOLUME_TEST_OBJS)
    7474
    7575include frams/Makefile-maintain
    7676
    7777full_clean: clean
    78         rm -f $(GDK_TESTS)
     78        rm -f $(SDK_TESTS)
  • cpp/frams/Makefile-SDK-files

    r269 r288  
    1414CONVFF=frams/genetics/fF/conv_fF.o frams/genetics/fF/fF_genotype.o frams/genetics/fF/fF_chamber3d.o
    1515
    16 GENOCONV_GDK_OBJS=frams/genetics/defgenoconv.o frams/vm/classes/genoobj.o frams/model/autoname.o $(CONVF1) $(CONVF4) $(CONVF9) $(CONVFF)
    17 GENMAN_GDK_OBJS=$(GENMAN_COMMON_OBJS) $(GENMANF4) $(GENMANF9) $(GENMANFF) $(GENMANFT)
     16GENOCONV_SDK_OBJS=frams/genetics/defgenoconv.o frams/vm/classes/genoobj.o frams/model/autoname.o $(CONVF1) $(CONVF4) $(CONVF9) $(CONVFF)
     17GENMAN_SDK_OBJS=$(GENMAN_COMMON_OBJS) $(GENMANF4) $(GENMANF9) $(GENMANFF) $(GENMANFT)
    1818
    1919GENMAN_COMMON_OBJS=frams/genetics/genman.o frams/param/mutableparam.o frams/param/mutparamlist.o frams/neuro/geneticneuroparam.o frams/neuro/neurolibparam.o
    2020
    21 GDK_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/framsg.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 frams/errmgr/errmanager.o frams/param/paramobj.o frams/genetics/oper_fx.o common/nonstd_math.o frams/errmgr/stderrors.o common/Convert.o frams/util/rndutil.o
     21SDK_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/framsg.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 frams/errmgr/errmanager.o frams/param/paramobj.o frams/genetics/oper_fx.o common/nonstd_math.o frams/errmgr/stderrors.o common/Convert.o frams/util/rndutil.o
    2222
    2323GEOMETRY_OBJS=frams/model/geometry/meshbuilder.o frams/model/geometry/modelgeometryinfo.o frams/model/geometry/geometryutils.o
    2424
    25 #### gdk_tests
     25#### sdk_tests
    2626
    27 GDK_TEST_OBJS= frams/_demos/gdk_test.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o  $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS)
     27GENOMANIPULATION_OBJS= frams/_demos/genomanipulation.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o  $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
    2828
    29 MULTILINE_F0_OBJS=frams/_demos/multiline_f0_test.o frams/virtfile/stringfile.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS)
     29MULTILINE_F0_OBJS=frams/_demos/multiline_f0_test.o frams/virtfile/stringfile.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
    3030
    31 F0_VARIANTS_OBJS=frams/_demos/f0_variants_test.o frams/virtfile/stringfile.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o   $(GDK_OBJS) $(GENOCONV_GDK_OBJS)
     31F0_VARIANTS_OBJS=frams/_demos/f0_variants_test.o frams/virtfile/stringfile.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o   $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
    3232
    33 LOADER_TEST_OBJS=frams/_demos/genotypeloader.o frams/_demos/loader_test.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS)
     33LOADER_TEST_OBJS=frams/_demos/genotypeloader.o frams/_demos/loader_test.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
    3434
    35 GENOCONV_TEST_OBJS= frams/_demos/genoconv_test.o frams/_demos/printconvmap.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o  $(GDK_OBJS) $(GENOCONV_GDK_OBJS)
     35GENOCONV_TEST_OBJS= frams/_demos/genoconv_test.o frams/_demos/printconvmap.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o  $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
    3636
    37 GENO_TEST_OBJS= frams/_demos/geno_test.o frams/virtfile/virtfile.o   $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS)
     37GENO_TEST_OBJS= frams/_demos/geno_test.o frams/virtfile/virtfile.o   $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
    3838
    39 GENOOPER_TEST_OBJS=frams/_demos/genooper_test.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS)
     39GENOOPER_TEST_OBJS=frams/_demos/genooper_test.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
    4040
    41 GENOOPER_TEST_FTEST_OBJS=frams/_demos/genooper_test_fTest.o frams/virtfile/virtfile.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS) $(GENMAN_FT)
     41GENOOPER_TEST_FTEST_OBJS=frams/_demos/genooper_test_fTest.o frams/virtfile/virtfile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS) $(GENMAN_FT)
    4242
    4343NEURO_TEST_OBJS= frams/_demos/neuro_test.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o \
    4444        frams/neuro/neuroimpl.o frams/neuro/neurofactory.o frams/neuro/impl/neuroimpl-simple.o frams/neuro/impl/neuroimpl-channels.o \
    45         frams/neuro/impl/neuroimpl-fuzzy.o frams/neuro/impl/neuroimpl-fuzzy-f0.o  $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS)
     45        frams/neuro/impl/neuroimpl-fuzzy.o frams/neuro/impl/neuroimpl-fuzzy-f0.o  $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
    4646
    47 FULL_PROPS_OBJS= frams/_demos/full_props.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o  frams/virtfile/stdiofile.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS)
     47FULL_PROPS_OBJS= frams/_demos/full_props.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o  frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
    4848
    49 SHAPECONVERT_OBJS= frams/_demos/shapeconvert.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o  frams/virtfile/stdiofile.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS)
     49SHAPECONVERT_OBJS= frams/_demos/shapeconvert.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o  frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
    5050
    51 SERIAL_TEST_OBJS= frams/_demos/serial_test.o frams/virtfile/virtfile.o  $(GDK_OBJS) $(GENOCONV_GDK_OBJS)
     51SERIAL_TEST_OBJS= frams/_demos/serial_test.o frams/virtfile/virtfile.o  $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
    5252
    53 PART_SHAPES_OBJS= frams/_demos/part_shapes.o frams/virtfile/virtfile.o  $(GDK_OBJS) $(GENOCONV_GDK_OBJS)
     53PART_SHAPES_OBJS= frams/_demos/part_shapes.o frams/virtfile/virtfile.o  $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
    5454
    55 NEURO_LAYOUT_TEST_OBJS= frams/_demos/neuro_layout_test.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS) frams/canvas/nn_layout_model.o frams/canvas/nn_simple_layout.o frams/canvas/nn_smart_layout.o
     55NEURO_LAYOUT_TEST_OBJS= frams/_demos/neuro_layout_test.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS) frams/canvas/nn_layout_model.o frams/canvas/nn_simple_layout.o frams/canvas/nn_smart_layout.o
    5656
    57 GEOMETRY_INFO_TEST_OBJS=frams/_demos/geometry/info_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GEOMETRY_OBJS)
     57GEOMETRY_INFO_TEST_OBJS=frams/_demos/geometry/info_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
    5858
    59 GEOMETRY_SURFACE_TEST_OBJS=frams/_demos/geometry/surface_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GEOMETRY_OBJS)
     59GEOMETRY_SURFACE_TEST_OBJS=frams/_demos/geometry/surface_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
    6060
    61 GEOMETRY_VOLUME_TEST_OBJS=frams/_demos/geometry/volume_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GEOMETRY_OBJS)
     61GEOMETRY_VOLUME_TEST_OBJS=frams/_demos/geometry/volume_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
    6262
    63 GEOMETRY_APICES_TEST_OBJS=frams/_demos/geometry/apices_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GEOMETRY_OBJS)
     63GEOMETRY_APICES_TEST_OBJS=frams/_demos/geometry/apices_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
  • cpp/frams/_demos/genomanipulation.cpp

    r287 r288  
    2222void printNiceBanner(const char* title)
    2323{
    24 printf("    ########################################\n"
    25        "   ##                                      ##\n"
    26        "  ##    %-32s    ##\n"
    27        "   ##                                      ##\n"
    28        "    ########################################\n",title);
     24printf("    #############################################\n"
     25       "   ##                                           ##\n"
     26       "  ##    %-37s    ##\n"
     27       "   ##                                           ##\n"
     28       "    #############################################\n",title);
    2929}
    3030void printProperties(Param &pi)
     
    268268{
    269269srand(time(0));
    270 printNiceBanner("Welcome to Genotype manipulation test application!");
     270printNiceBanner("Welcome to Genotype Manipulation App!");
    271271
    272272findingConverters();
     
    347347printf("\n######### THE END ###########\n\n"
    348348       "Hints:\n"
    349        "  1. You can redirect output: gdk_test >filename.txt\n"
     349       "  1. You can redirect output: genomanipulation >filename.txt\n"
    350350       "  2. Each run can yield different results, because some\n"
    351351       "     values are randomly generated.\n"
    352352       "  3. This application will use custom genotype passed as\n"
    353        "     a commandline parameter: gdk_test XX\n"
     353       "     a commandline parameter: genomanipulation XX\n"
    354354       "\n");
    355355return 0;
  • cpp/frams/_demos/neuro_test.cpp

    r286 r288  
    1616*/
    1717
    18 #ifndef GDK_WITHOUT_FRAMS
     18#ifndef SDK_WITHOUT_FRAMS
    1919#include <frams/mech/creatmechobj.h>
    2020int CreatMechObject::modeltags_id=0;
  • cpp/frams/config/sdk_build_config.h

    r286 r288  
    33// See LICENSE.txt for details.
    44
    5 #ifndef _GDK_BUILD_CONFIG_H_
    6 #define _GDK_BUILD_CONFIG_H_
     5#ifndef _SDK_BUILD_CONFIG_H_
     6#define _SDK_BUILD_CONFIG_H_
    77
    88#include "version.h"
     
    1010#define NOCREATUREOBJECT
    1111#define EASYMAPDEBUG
    12 #define GDK_WITHOUT_FRAMS
     12#define SDK_WITHOUT_FRAMS
    1313#define NO_BARRIER
    1414#define NO_VMACHINE
    1515
    16 #define NEURO_IMPL_FILES "neuroimplfiles-GDK.h"
    17 #define NEURO_CLS_FACTORY "neurocls-f0-GDK-factory.h"
    18 #define NEURO_CLS_LIBRARY "neurocls-f0-GDK-library.h"
    19 #define F0_DEFASSIGN_FILE "defassign-f0-GDK.h"
    20 #define F0_CLASSES_FILE "f0-GDK-classes.h"
    21 #define GEN_CONFIG_FILE "gen-config-GDK.h"
     16#define NEURO_IMPL_FILES "neuroimplfiles-SDK.h"
     17#define NEURO_CLS_FACTORY "neurocls-f0-SDK-factory.h"
     18#define NEURO_CLS_LIBRARY "neurocls-f0-SDK-library.h"
     19#define F0_DEFASSIGN_FILE "defassign-f0-SDK.h"
     20#define F0_CLASSES_FILE "f0-SDK-classes.h"
     21#define GEN_CONFIG_FILE "gen-config-SDK.h"
    2222
    2323#endif
  • cpp/frams/model/modelparts.cpp

    r286 r288  
    2525#include F0_DEFASSIGN_FILE
    2626
    27 #ifndef GDK_WITHOUT_FRAMS
     27#ifndef SDK_WITHOUT_FRAMS
    2828#include <frams/neuro/neuroclsobject.h>
    2929#endif
     
    539539void Neuro::get_classObject(PARAMGETARGS)
    540540{
    541 #ifndef GDK_WITHOUT_FRAMS
     541#ifndef SDK_WITHOUT_FRAMS
    542542NeuroClassExt::makeStaticObject(ret,getClass());
    543543#endif
  • cpp/frams/neuro/neuroimpl.cpp

    r286 r288  
    77#include <frams/util/rndutil.h>
    88#include <common/nonstd_math.h>
    9 #ifndef GDK_WITHOUT_FRAMS
     9#ifndef SDK_WITHOUT_FRAMS
    1010#include <frams/simul/creature.h>
    1111#include <frams/mech/creatmechobj.h>
     
    463463Creature* NeuroImpl::getCreature()
    464464{
    465 #ifndef GDK_WITHOUT_FRAMS
     465#ifndef SDK_WITHOUT_FRAMS
    466466CreatMechObject *cmo=(CreatMechObject *)neuro->owner->userdata[CreatMechObject::modeltags_id];
    467467return cmo->creature;
     
    473473void NeuroImpl::get_creature(ExtValue *ret)
    474474{
    475 #ifndef GDK_WITHOUT_FRAMS
     475#ifndef SDK_WITHOUT_FRAMS
    476476ret->setObject(ExtObject(&creature_param,getCreature()));
    477477#endif
     
    480480void NeuroImpl::get_part(ExtValue *ret)
    481481{
    482 #ifndef GDK_WITHOUT_FRAMS
     482#ifndef SDK_WITHOUT_FRAMS
    483483Part *pa;
    484484if (pa=neuro->getPart())
     
    491491void NeuroImpl::get_joint(ExtValue *ret)
    492492{
    493 #ifndef GDK_WITHOUT_FRAMS
     493#ifndef SDK_WITHOUT_FRAMS
    494494Joint *jo;
    495495if (jo=neuro->getJoint())
     
    502502bool NeuroImpl::getPosition(Pt3D &pos)
    503503{
    504 #ifndef GDK_WITHOUT_FRAMS
     504#ifndef SDK_WITHOUT_FRAMS
    505505Part *pa; Joint *jo;
    506506if (pa=neuro->getPart())
     
    548548void NeuroImpl::get_classObject(ExtValue *ret)
    549549{
    550 #ifndef GDK_WITHOUT_FRAMS
     550#ifndef SDK_WITHOUT_FRAMS
    551551NeuroClassExt::makeStaticObject(ret,neuroclass);
    552552#endif
  • cpp/frams/neuro/neuroimplfiles-SDK.h

    r286 r288  
    66#include "impl/neuroimpl-channels.h"
    77#include "impl/neuroimpl-fuzzy.h"
    8 #ifdef GDK_WITHOUT_FRAMS
    9 #include "impl/neuroimpl-body-gdk.h"
     8#ifdef SDK_WITHOUT_FRAMS
     9#include "impl/neuroimpl-body-sdk.h"
    1010#else
    1111#include "impl/neuroimpl-test.h"
  • cpp/frams/param/syntparam.h

    r286 r288  
    1515    on Models and Genotypes).
    1616
    17     See also: gdktest.cpp
     17    See also: genomanipulation.cpp
    1818 */
    1919class SyntParam: public Param
Note: See TracChangeset for help on using the changeset viewer.