Ignore:
Timestamp:
12/11/20 21:36:41 (3 months ago)
Author:
Maciej Komosinski
Message:

SimilMeasure? -> SimilMeasureBase?; introduced a new class (SimilMeasure?) that allows scripts to access all similarity measures; a number of minor fixes and improvements

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/model/similarity/simil-measure.h

    r1044 r1048  
    66#define _SIMIL_MEASURE_H
    77
    8 #include "frams/genetics/geno.h"
    9 #include "frams/model/model.h"
    10 #include <assert.h>
     8#include "frams/model/similarity/measure-greedy.h"
     9#include "frams/model/similarity/measure-hungarian.h"
     10#include "frams/model/similarity/measure-distribution.h"
    1111
    1212class SimilMeasure
    1313{
    1414public:
    15         SimilMeasure();
    1615        int measure_type;
     16
     17        SimilMeasureGreedy simil_measure_greedy;
     18        SimilMeasureHungarian simil_measure_hungarian;
     19        SimilMeasureDistribution simil_measure_distribution;
     20
    1721        /// Interface to local parameters
    1822        Param localpar;
    1923
    20         virtual ~SimilMeasure(){};
    21         virtual double getDistance() = 0;
     24        SimilMeasure();
     25        virtual ~SimilMeasure() {};
    2226        double evaluateDistance(const Geno *G0, const Geno *G1);
    23         virtual int setParams(std::vector<double> params) = 0;
    24     Model sampleSurface(Model *M, double density);
    2527
    2628        #define STATRICKCLASS SimilMeasure
    2729        PARAMPROCDEF(p_evaldistance);
    2830        #undef STATRICKCLASS
    29 
    30 protected:
    31         /// Genotypes between which distance is evaluated.
    32         const Geno *genos[2];
    33         /// Models created from the genotypes array
    34         Model *models[2];
    35         Model* newModel(const Geno *g);
    3631};
    3732
    3833#endif
    39 
Note: See TracChangeset for help on using the changeset viewer.