Changeset 1044 for cpp/frams/model

Timestamp:

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

Author:

oriona

Message:

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

Location:

cpp/frams/model/similarity

Files:

• EMD (added)
• EMD/emd.c (added)
• EMD/emd.h (added)
• measure-distribution.cpp (added)
• measure-distribution.h (added)
• measure-greedy.cpp (added)
• measure-greedy.h (added)
• measure-hungarian.cpp (added)
• measure-hungarian.h (added)
• measure-mds-based.cpp (added)
• measure-mds-based.h (added)
• simil-match.cpp (moved) (moved from cpp/frams/model/similarity/simil_match.cpp) (10 diffs)
• simil-match.h (moved) (moved from cpp/frams/model/similarity/simil_match.h) (2 diffs)
• simil-measure.cpp (added)
• simil-measure.h (added)

cpp/frams/model/similarity/simil-match.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
 #include <assert.h>
 #include <stdio.h>
-#include "simil_match.h"
+#include "simil-match.h"
 
 /** Creates an empty matching for two objects of specified size.
@@ -63 +63 @@
                 @return Size of the object (in elements).
  */
-int SimilMatching::GetObjectSize(int Obj)
+int SimilMatching::getObjectSize(int Obj)
 {
         // check parameter
@@ -81 +81 @@
 
  */
-void SimilMatching::Match(int Obj0, int Index0, int Obj1, int Index1)
+void SimilMatching::match(int Obj0, int Index0, int Obj1, int Index1)
 {
         // check parameters of object 0
@@ -103 +103 @@
                 @return true if the given element is matched, false otherwise.
  */
-bool SimilMatching::IsMatched(int Obj, int Index)
+bool SimilMatching::isMatched(int Obj, int Index)
 {
         // check parameters
@@ -128 +128 @@
                 (check IsMatched() before using GetMatchedIndex()).
  */
-int SimilMatching::GetMatchedIndex(int Obj, int Index)
+int SimilMatching::getMatchedIndex(int Obj, int Index)
 {
         // check parameters
@@ -142 +142 @@
                 @return true if matching is full, false otherwise.
  */
-bool SimilMatching::IsFull()
+bool SimilMatching::isFull()
 {
         // assume that the matching is full
@@ -177 +177 @@
         @return true if matching is empty, otherwise - false.
  */
-bool SimilMatching::IsEmpty()
+bool SimilMatching::isEmpty()
 {
         // result - assume that matching is empty
@@ -201 +201 @@
 /** Makes the matching completely empty. After a call to this method IsEmpty() should return true.
  */
-void SimilMatching::Empty()
+void SimilMatching::empty()
 {
         for (int iObj = 0; iObj < 2; iObj++) // a counter of objects
@@ -215 +215 @@
 
         // the exit condition
-        assert(IsEmpty() == true);
+        assert(isEmpty() == true);
 }
 
 /** Prints the current state of the matching
  */
-void SimilMatching::PrintMatching()
+void SimilMatching::printMatching()
 {
         int nBigger;
@@ -249 +249 @@
                 for (unsigned int i = 0; i < m_apvMatched[nObj]->size(); i++)
                 {
-                        if (IsMatched(nObj, i))
+                        if (isMatched(nObj, i))
                         {
                                 // if the element is matched - print the index
-                                printf("%2d ", GetMatchedIndex(nObj, i));
+                                printf("%2d ", getMatchedIndex(nObj, i));
                         }
                         else

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

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -26 +26 @@
         SimilMatching(const SimilMatching &Source);
         ~SimilMatching();
-        int GetObjectSize(int Obj);
-        void Match(int Obj0, int Index0, int Obj1, int Index1);
-        bool IsMatched(int Obj, int Index);
-        int GetMatchedIndex(int Obj, int index);
-        bool IsFull();
-        bool IsEmpty();
-        void Empty();
-        void PrintMatching();
+        int getObjectSize(int Obj);
+        void match(int Obj0, int Index0, int Obj1, int Index1);
+        bool isMatched(int Obj, int Index);
+        int getMatchedIndex(int Obj, int index);
+        bool isFull();
+        bool isEmpty();
+        void empty();
+        void printMatching();
 };