Merge pull request #248 from private-octopus/fix-m33-arpa

Fix m33 arpa
private-octopus · Jun 4, 2024 · bccf533 · bccf533
2 parents 2dedace + dbd84e5
commit bccf533
Show file tree

Hide file tree

Showing 11 changed files with 1,073 additions and 440 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -188,10 +188,10 @@ ADD_LIBRARY(ithicap SHARED
 )
 
 SET_TARGET_PROPERTIES(ithicap PROPERTIES
-                              VERSION 2.04
+                              VERSION 2.05
                               PUBLIC_HEADER include/ithicap.h)
 
-SET_TARGET_PROPERTIES(ithitools PROPERTIES VERSION 2.04)
+SET_TARGET_PROPERTIES(ithitools PROPERTIES VERSION 2.05)
 
 SET(TEST_EXES ithitest)
 

diff --git a/data/M3-2017-01-31.csv b/data/M3-2017-01-31.csv
@@ -13,7 +13,7 @@ M3.3.2,2017-01-31,v1.06, LAN, 0.006411
 M3.3.2,2017-01-31,v1.06, IP, 0.006402
 M3.3.2,2017-01-31,v1.06, INTERNAL, 0.004578
 M3.3.2,2017-01-31,v1.06, LOCALDOMAIN, 0.004409
-M3.3.2,2017-01-31,v1.06, OPENSTACKLOCAL, 0.003956
+M3.3.2,2017-01-31,v1.06, ARPA, 0.003956
 M3.3.2,2017-01-31,v1.06, DLINK, 0.003062
 M3.3.2,2017-01-31,v1.06, CORP, 0.002226
 M3.3.2,2017-01-31,v1.06, _0x83, 0.002166

diff --git a/data/M3-2017-02-28.csv b/data/M3-2017-02-28.csv
@@ -13,7 +13,7 @@ M3.3.2,2017-02-28,v1.06, LAN, 0.004867
 M3.3.2,2017-02-28,v1.06, INTERNAL, 0.004493
 M3.3.2,2017-02-28,v1.06, LOCALDOMAIN, 0.004337
 M3.3.2,2017-02-28,v1.06, IP, 0.004310
-M3.3.2,2017-02-28,v1.06, OPENSTACKLOCAL, 0.003381
+M3.3.2,2017-02-28,v1.06, ARPA, 0.003381
 M3.3.2,2017-02-28,v1.06, DLINK, 0.003368
 M3.3.2,2017-02-28,v1.06, CORP, 0.002279
 M3.3.2,2017-02-28,v1.06, DAVOLINK, 0.002000

diff --git a/data/M3Data-test-ref.txt b/data/M3Data-test-ref.txt
@@ -19,7 +19,6 @@
 ["INTERNAL", [0.457800, 0.449300]],
 ["LOCALDOMAIN", [0.440900, 0.433700]],
 ["IP", [0.640200, 0.431000]],
-["OPENSTACKLOCAL", [0.395600, 0.338100]],
 ["DLINK", [0.306200, 0.336800]],
 ["CORP", [0.222600, 0.227900]],
 ["DAVOLINK", [0.188900, 0.200000]],