Changeset 1044 for cpp/frams/_demos/paramtree_paramlist_test.cpp

Timestamp:

12/10/20 22:33:22 (4 years ago)

Author:

oriona

Message:

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

File:

• cpp/frams/_demos/paramtree_paramlist_test.cpp (modified) (3 diffs)

cpp/frams/_demos/paramtree_paramlist_test.cpp

@@ -11 +11 @@
 #include <frams/model/geometry/modelgeoclass.h>
 #include <frams/model/modelobj.h>
+#include <frams/model/similarity/measure-distribution.h>
+#include <frams/model/similarity/measure-greedy.h>
+#include <frams/model/similarity/measure-hungarian.h>
 #include "genotypeloader.h"
 #include "paramtree_print.h"
@@ -27 +30 @@
         NeuroNetConfig nn_config(&neurofac);
         ModelGeometry modelgeo;
+        SimilMeasureDistribution simil_measure_distr;
+        SimilMeasureGreedy simil_measure_greedy;
+        SimilMeasureHungarian simil_measure_hungarian;
 
         MutableParamList combined;
@@ -39 +45 @@
         combined += &nn_config.par;
         combined += &modelgeo.par;
+        combined += &simil_measure_distr.localpar;
+        combined += &simil_measure_greedy.localpar;
+        combined += &simil_measure_hungarian.localpar;
 
         ParamTree tree(&combined);