Ignore:
Timestamp:
12/10/20 22:33:22 (3 months ago)
Author:
oriona
Message:

Similarity measures code refactored. Distribution-based similarity measure added.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/_demos/paramtree_paramlist_test.cpp

    r795 r1044  
    1111#include <frams/model/geometry/modelgeoclass.h>
    1212#include <frams/model/modelobj.h>
     13#include <frams/model/similarity/measure-distribution.h>
     14#include <frams/model/similarity/measure-greedy.h>
     15#include <frams/model/similarity/measure-hungarian.h>
    1316#include "genotypeloader.h"
    1417#include "paramtree_print.h"
     
    2730        NeuroNetConfig nn_config(&neurofac);
    2831        ModelGeometry modelgeo;
     32        SimilMeasureDistribution simil_measure_distr;
     33        SimilMeasureGreedy simil_measure_greedy;
     34        SimilMeasureHungarian simil_measure_hungarian;
    2935
    3036        MutableParamList combined;
     
    3945        combined += &nn_config.par;
    4046        combined += &modelgeo.par;
     47        combined += &simil_measure_distr.localpar;
     48        combined += &simil_measure_greedy.localpar;
     49        combined += &simil_measure_hungarian.localpar;
    4150
    4251        ParamTree tree(&combined);
Note: See TracChangeset for help on using the changeset viewer.