Changeset 1049 for cpp/frams


Ignore:
Timestamp:
12/11/20 21:39:46 (4 years ago)
Author:
Maciej Komosinski
Message:

Updates for compilation+linking of new similarity measures

Location:
cpp/frams
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • cpp/frams/Makefile-SDK-files

    r1045 r1049  
    3737NEURO_OBJS=frams/neuro/neuroimpl.o frams/neuro/neurofactory.o frams/neuro/impl/neuroimpl-simple.o frams/neuro/impl/neuroimpl-channels.o frams/neuro/impl/neuroimpl-fuzzy.o frams/neuro/impl/neuroimpl-fuzzy-f0.o
    3838
    39 SIMILARITY_OBJS=frams/model/similarity/measure-greedy.o frams/model/similarity/measure-hungarian.o frams/model/similarity/measure-distribution.o frams/model/similarity/measure-mds-based.o frams/model/similarity/simil-measure.o frams/model/similarity/hungarian/hungarian.o frams/model/similarity/SVD/lapack.o frams/model/similarity/SVD/matrix_tools.o frams/model/similarity/simil-match.o
     39SIMILARITY_OBJS=frams/model/similarity/measure-greedy.o frams/model/similarity/measure-hungarian.o frams/model/similarity/measure-distribution.o frams/model/similarity/measure-mds-based.o frams/model/similarity/simil-measure.o frams/model/similarity/simil-measure-base.o frams/model/similarity/hungarian/hungarian.o frams/model/similarity/SVD/lapack.o frams/model/similarity/SVD/matrix_tools.o frams/model/similarity/simil-match.o
    4040
    4141NN_LAYOUT_OBJS=frams/canvas/nn_layout_model.o frams/canvas/nn_simple_layout.o frams/canvas/nn_smart_layout.o

  • cpp/frams/_demos/simil_test.cpp

    r1044 r1049  
    4646    typedef double *pDouble;
    4747    LoggerToStdout messages_to_stdout(LoggerBase::Enable);
    48     SimilMeasure *simil_measure = nullptr;
     48    SimilMeasureBase *simil_measure = nullptr;
    4949    if (argc < 5)
    5050    {
Note: See TracChangeset for help on using the changeset viewer.