Merge branch 'develop'

Author: kosloot

.github/workflows/timbl.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        compiler: [g++-12, clang++ -std=c++17]
+        compiler: [g++ -std=c++17, clang++ -std=c++17]
 
     steps:
 

NEWS

@@ -1,3 +1,4 @@
+6.11
 6.10 2024-12-16
 [Ko van der Sloot]
 * C++17 is required

README.md

@@ -6,7 +6,7 @@
 TiMBL: Tilburg Memory Based Learner
 ===========================================
 
-    TiMBL 6.4 (c) CLS/ILK/CLiPS 1998 - 2024
+    TiMBL 6.4 (c) CLS/ILK/CLiPS 1998 - 2025
     Centre for Language Studies, Radboud University Nijmegen
     Induction of Linguistic Knowledge Research Group, Tilburg University and
     Centre for Dutch Language and Speech, University of Antwerp

codemeta.json

@@ -7,7 +7,7 @@
     "@type": "SoftwareSourceCode",
     "identifier": "timbl",
     "name": "TiMBL",
-    "version": "6.10",
+    "version": "6.11",
     "description": "TiMBL is an open source software package implementing several memory-based learning algorithms, among which IB1-IG, an implementation of k-nearest neighbor classification with feature weighting suitable for symbolic feature spaces, and IGTree, a decision-tree approximation of IB1-IG. All implemented algorithms have in common that they store some representation of the training set explicitly in memory. During testing, new cases are classified by extrapolation from the most similar stored cases.",
     "license": "https://spdx.org/licenses/GPL-3.0",
 	"url": "https://languagemachines.github.io/timbl",

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([timbl],[6.10],[lamasoftware@science.ru.nl]) #also adapt in codemeta.json!
+AC_INIT([timbl],[6.11],[lamasoftware@science.ru.nl]) #also adapt in codemeta.json!
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([.])
 AC_CONFIG_MACRO_DIR([m4])

include/timbl/BestArray.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 1998 - 2024
+  Copyright (c) 1998 - 2025
   ILK   - Tilburg University
   CLST  - Radboud University
   CLiPS - University of Antwerp

include/timbl/Choppers.h

@@ -1,7 +1,7 @@
 #ifndef TIMBL_CHOPPERS_H
 #define TIMBL_CHOPPERS_H
 /*
-  Copyright (c) 1998 - 2024
+  Copyright (c) 1998 - 2025
   ILK   - Tilburg University
   CLST  - Radboud University
   CLiPS - University of Antwerp

include/timbl/Common.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 1998 - 2024
+  Copyright (c) 1998 - 2025
   ILK   - Tilburg University
   CLST  - Radboud University
   CLiPS - University of Antwerp

include/timbl/Features.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 1998 - 2024
+  Copyright (c) 1998 - 2025
   ILK   - Tilburg University
   CLST  - Radboud University
   CLiPS - University of Antwerp

include/timbl/GetOptClass.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 1998 - 2024
+  Copyright (c) 1998 - 2025
   ILK   - Tilburg University
   CLST  - Radboud University
   CLiPS - University of Antwerp
@@ -92,6 +92,7 @@ namespace Timbl {
     bool do_sloppy_loo;
     bool do_silly;
     bool do_diversify;
+    bool do_prune;
     std::vector<MetricType>metricsArray;
     std::ostream *parent_socket_os;
     std::string inPath;