Changeset 1048 for cpp/frams/model/similarity/simil-measure.h

Timestamp:

12/11/20 21:36:41 (2 years 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:

• cpp/frams/model/similarity/simil-measure.h (modified) (1 diff)

cpp/frams/model/similarity/simil-measure.h

@@ -6 +6 @@
 #define _SIMIL_MEASURE_H
 
-#include "frams/genetics/geno.h"
-#include "frams/model/model.h"
-#include <assert.h>
+#include "frams/model/similarity/measure-greedy.h"
+#include "frams/model/similarity/measure-hungarian.h"
+#include "frams/model/similarity/measure-distribution.h"
 
 class SimilMeasure
 {
 public:
-        SimilMeasure();
         int measure_type;
+
+        SimilMeasureGreedy simil_measure_greedy;
+        SimilMeasureHungarian simil_measure_hungarian;
+        SimilMeasureDistribution simil_measure_distribution;
+
         /// Interface to local parameters
         Param localpar;
 
-        virtual ~SimilMeasure(){};
-        virtual double getDistance() = 0;
+        SimilMeasure();
+        virtual ~SimilMeasure() {};
         double evaluateDistance(const Geno *G0, const Geno *G1);
-        virtual int setParams(std::vector<double> params) = 0;
-    Model sampleSurface(Model *M, double density);
 
         #define STATRICKCLASS SimilMeasure
         PARAMPROCDEF(p_evaldistance);
         #undef STATRICKCLASS
-
-protected:
-        /// Genotypes between which distance is evaluated.
-        const Geno *genos[2];
-        /// Models created from the genotypes array
-        Model *models[2];
-        Model* newModel(const Geno *g);
 };
 
 #endif
-