Changeset 893 for cpp/tests

Timestamp:

09/06/19 11:40:57 (5 years ago)

Author:

oriona

Message:

Similarity modified and expanded to include both old (greedy) and new (hungarian) measures.

File:

• cpp/tests/similarity-tests.txt (modified) (6 diffs)

cpp/tests/similarity-tests.txt

@@ -3 +3 @@
 TESTNAME:parts weight
 arg:similarity.gen
+arg:0
 arg:1
 arg:0
@@ -13 +14 @@
 TESTNAME:degrees weight
 arg:similarity.gen
+arg:0
 arg:0
 arg:1
@@ -25 +27 @@
 arg:0
 arg:0
+arg:0
 arg:1
 arg:0
@@ -31 +34 @@
 RUNTEST
 
-TESTNAME:distances weight
+TESTNAME:distances weight greedy
 arg:similarity.gen
+arg:1
 arg:0
 arg:0
@@ -38 +42 @@
 arg:1
 arg:0
-out:*INSERTPLATFORMDEPENDENTFILE*:similarity_goals/distances_weight
+out:*INSERTPLATFORMDEPENDENTFILE*:similarity_goals/distances_weight_greedy
 RUNTEST
 
-TESTNAME:all weights
-arg:similarity.gen
-arg:1
-arg:1
-arg:1
-arg:1
-arg:0
-out:*INSERTPLATFORMDEPENDENTFILE*:similarity_goals/all_weights
-RUNTEST
-
-TESTNAME:all weights fixed z
+TESTNAME:all weights greedy
 arg:similarity.gen
 arg:1
@@ -58 +52 @@
 arg:1
 arg:1
-out:*INSERTPLATFORMDEPENDENTFILE*:similarity_goals/all_weights_fixed_z
+arg:0
+out:*INSERTPLATFORMDEPENDENTFILE*:similarity_goals/all_weights_greedy
 RUNTEST
 
+TESTNAME:all weights fixed z greedy
+arg:similarity.gen
+arg:1
+arg:1
+arg:1
+arg:1
+arg:1
+arg:1
+out:*INSERTPLATFORMDEPENDENTFILE*:similarity_goals/all_weights_fixed_z_greedy
+RUNTEST
+
+TESTNAME:distances weight hungarian
+arg:similarity.gen
+arg:0
+arg:0
+arg:0
+arg:0
+arg:1
+arg:0
+out:*INSERTPLATFORMDEPENDENTFILE*:similarity_goals/distances_weight_hungarian
+RUNTEST
+
+TESTNAME:all weights hungarian
+arg:similarity.gen
+arg:0
+arg:1
+arg:1
+arg:1
+arg:1
+arg:0
+out:*INSERTPLATFORMDEPENDENTFILE*:similarity_goals/all_weights_hungarian
+RUNTEST
+
+TESTNAME:all weights fixed z hungarian
+arg:similarity.gen
+arg:0
+arg:1
+arg:1
+arg:1
+arg:1
+arg:1
+out:*INSERTPLATFORMDEPENDENTFILE*:similarity_goals/all_weights_fixed_z_hungarian
+RUNTEST
+