update pll-modules, tests and version number

amkozlov · May 9, 2023 · 3c7e27e · 3c7e27e
1 parent 64aa135
commit 3c7e27e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -71,7 +71,7 @@ endif()
 
 
 set (raxml-ng_VERSION_MAJOR 1)
-set (raxml-ng_VERSION_MINOR 1)
+set (raxml-ng_VERSION_MINOR 2)
 
 #set (CMAKE_BUILD_TYPE DEBUG)
 #set (CMAKE_BUILD_TYPE RELEASE)

diff --git a/libs/pll-modules b/libs/pll-modules
diff --git a/src/version.h b/src/version.h
@@ -1,3 +1,3 @@
-#define RAXML_VERSION "1.1.0-dev"
-#define RAXML_DATE    "06.05.2023"
+#define RAXML_VERSION "1.2.0"
+#define RAXML_DATE    "09.05.2023"
 #define RAXML_INTVER  120
diff --git a/test/src/ModelTest.cpp b/test/src/ModelTest.cpp
@@ -311,12 +311,12 @@ TEST(ModelTest, multistate_custom)
 TEST(ModelTest, genotype)
 {
   // buildup
-  auto model = Model(DataType::autodetect, "GTGTR4");
+  auto model = Model(DataType::autodetect, "GT10");
 
   // tests
-  EXPECT_EQ("GTGTR4+FO", model.to_string());
+  EXPECT_EQ("GT10+FO", model.to_string());
   EXPECT_EQ(DataType::genotype10, model.data_type());
-  EXPECT_EQ("GTGTR4", model.name());
+  EXPECT_EQ("GT10", model.name());
   EXPECT_EQ(10, model.num_states());
   EXPECT_EQ(PLLMOD_UTIL_MIXTYPE_FIXED, model.ratehet_mode());
   EXPECT_EQ(1, model.num_ratecats());