Update CHANGES and bump (dev) version.

CHANGES

@@ -1,3 +1,21 @@
+clasp 3.3.11:
+  * updated libpotassco (improved `lpconvert` and small fixes)
+  * added option '--opt-stop' for stopping optimization at a given bound
+  * improved VMTF implementation
+  * simplified RestartParams
+  * simplified output customization (see https://github.com/potassco/clingo/pull/490)
+  * fixed and improved cautious/brave model state update (see https://github.com/potassco/clingo/pull/519)
+  * added number of blocked restarts to stats
+  * reworked dynamic/blocked restarts and added support for different moving averages
+  * added support for pb-constraints in [w]cnf+ format
+  * "tweety" asp options are now applied when using config "many"
+  * fixed handling of "sticky" logic program options
+  * fixed tests for CLASP_BUILD_WITH_THREADS=OFF
+  * fixed potential infinite loop in DimcasParser
+  * fixed potential nullptr access in parallel solve
+  * fixed issue https://github.com/potassco/clasp/issues/103
+  * fixed issue https://github.com/potassco/clasp/issues/101
+
 clasp 3.3.10: Wednesday, 7th February 2024
   * fixed issue https://github.com/potassco/clasp/issues/88
   * fixed issue https://github.com/potassco/clasp/issues/90
@@ -102,7 +120,7 @@ clasp 3.3.0: Friday, 28th April 2017
     - changed syntax of option  "--opt-strategy" (old syntax is still supported but deprecated)
       - First argument selects the overall strategy, i.e. model- or core-guided optimization
       - Second argument selects the algorithm, e.g. "K" or "OLL" for core-guided optimization
-      - Further arguments enable additional tactics, e.g. "disjoint" for disjoint core 
+      - Further arguments enable additional tactics, e.g. "disjoint" for disjoint core
         preprocessing in core-guided optimization
     - option "--pre" now prints aspif by default (use "--pre=smodels" for smodels)
 	- merged option "--opt-bound" into "--opt-mode"
@@ -127,7 +145,7 @@ clasp 3.2.3: Monday, 24th April 2017
   * fixed regression in enum mode "domRec" in case of complementary atoms
   * fixed spurious backtracking on integrating sat clauses from theory propagator
   * fixed regression: model heuristic ("--opt-heuristic=2") not applied
-  
+
 clasp 3.2.2: Monday, 23rd January 2017
   * added experimental support for MiniCard's CNF+ format
   * added missing stats key "summary.winner" for getting id of winner thread from clingo
@@ -139,7 +157,7 @@ clasp 3.2.2: Monday, 23rd January 2017
   * fixed: invalid logged lemmas due to buggy minimization in Solver::resolveToFlagged()
   * fixed: LogicProgram::dispose() must reset pointers
   * fixed compilation problems on Cygwin and Alpha
-  
+
 clasp 3.2.1: Thursday, 13th October 2016
   * added support for adding variables from theory propagator
   * fixed output of "--pre" wrt to externals in incremental setting
@@ -188,11 +206,11 @@ clasp 3.1.5: Friday, 5th August 2016 (updated: 11th August 2016)
   * fixed: invalid models in parallel disjunctive solving due to unsynchronized simplifications
   * fixed: Json output sometimes failed to report correct number of optimal models
   * fixed: SAT-frontend must retain pure literals for cautious/brave reasoning
-  * fixed: ClaspFacade::start() sometimes failed to reset SharedContext  
+  * fixed: ClaspFacade::start() sometimes failed to reset SharedContext
   * fixed: Sat-Preprocessor failed to propagate resolution of empty clause
   * fixed: simplifications after end of incremental step not always propagated to all threads
   * fixed too strong assertion in eq-preprocessor
-  
+
 clasp 3.1.4: Thursday, 10th December 2015
   * fixed: "--pre" failed to handle choice/disjunctive heads defined by extended bodies
   * fixed: "--backprop" failed to backpropagte certain constraints when used with "--eq=0"
@@ -209,7 +227,7 @@ clasp 3.1.3: Friday, 31th July 2015
   * fixed: over-satisfied PB constraints not always handled correctly
   * fixed: incorrect handling of aux vars in Solver::numWatches()
   * fixed: C++11 isnan issue on Mac
-  
+
 clasp 3.1.2: Tuesday, 5th May 2015
   * fixed: Option "--heuristic" failed to accept decay factor for domain heuristic
   * fixed: LogicProgram::getDisjFor() failed to handle hash collisions correctly
@@ -227,18 +245,18 @@ clasp 3.1.1: Wednesday, 12th November 2014
   * fixed regression in rule simplification (regression in 3.0.x)
   * fixed regression in "--configuration=jumpy"
   * fixed regression in handling of modifiers true/false in domain heuristic
-  
+
 clasp 3.1.0: Friday, 15th August 2014
   * added new strategies for unsatisfiable-core based optimization
   * added alternative distribution mode via thread-local queues (option " --dist-mode")
   * generators now propagate top-level assignment to testers
   * removed optimization options from default configurations
   * CLI changes:
     - option "--sat-prepro" now expects the algorithm followed by an optional list of limits
-    - option "--opt-strategy" now takes two arguments; the first mandatory argument selects the 
+    - option "--opt-strategy" now takes two arguments; the first mandatory argument selects the
       major strategy (i.e. branch and bound or unsat-core), while the optional second argument
       controls fine tuning of said strategy
-    - combined options "--dom-mod" and "--dom-pref" and added enum mode "domRec" for 
+    - combined options "--dom-mod" and "--dom-pref" and added enum mode "domRec" for
       enabling subset optimization via domain heuristic
     - added "--forget-on-step=2" for discarding previously set variable phases and changed
       value for discarding nogood activities and learnt nogoods to 4 and 8, respectively
@@ -260,17 +278,17 @@ clasp 3.0.6: Monday, 21st July 2014
   * fixed: incremental domain heuristic failed to apply values to atoms from previous steps
   * fixed: eq over bodies of size 1 not always correctly handled
   * fixed: typo in description of "--quiet"
-  
+
 clasp 3.0.5: Monday, 19th May 2014
   * added support for ThreadTime::getTime() on MacOS X
   * removed pointless "--del-init" option from config tweety
   * fixed: non-hcf components not always correctly added in incremental disjunctive programs (clingo)
   * fixed: empty soft clauses not correctly handled in MaxSAT frontend
-  * fixed: unfounded sets from 2nd level test not always correctly handled 
+  * fixed: unfounded sets from 2nd level test not always correctly handled
   * fixed: json output must not print NaN
   * fixed: asp options not correctly set on configuration update (from clingo)
   * fixed: regression in handling of (incremental) projection
-  
+
 clasp 3.0.4: Thursday, 24th April 2014
   * replaced "s SATISFIABLE" with "s UNKNOWN" when called with option "--opt-sat"
   * improved handling of weight constraints containing incremental assumptions
@@ -284,7 +302,7 @@ clasp 3.0.3: Friday, 28th March 2014
   * fixed: AsyncResult destructor fails if called after destruction of ClaspFacade
   * fixed: projective enumeration sometimes fails when used with option "--restart-on-model"
   * fixed: regression in handling of negative lower bound in optimization
-  
+
 clasp 3.0.2: Monday, 17th March 2014
   * patch 1 (March 19th, 2014): fixed regression in projective enumeration
   * added ClaspFacade::startSolveAsync() for enumerating models in an iterator-like fashion

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.1)
-project(CLASP VERSION 3.3.10 LANGUAGES CXX)
+project(CLASP VERSION 3.3.10.14 LANGUAGES CXX)
 # Enable folders in IDEs like Visual Studio
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 if (POLICY CMP0063)

clasp/config.h.in

@@ -30,7 +30,7 @@
 #endif
 
 //! Library version.
-#define CLASP_VERSION      "@CLASP_VERSION@"
+#define CLASP_VERSION      "@CLASP_VERSION_STRING@"
 #define CLASP_VERSION_MAJOR @CLASP_VERSION_MAJOR@
 #define CLASP_VERSION_MINOR @CLASP_VERSION_MINOR@
 #define CLASP_VERSION_PATCH @CLASP_VERSION_PATCH@

src/CMakeLists.txt

@@ -30,6 +30,11 @@ if (NOT DEFINED CLASP_USE_STD_VECTOR)
 		set(CLASP_USE_STD_VECTOR 0)
 	endif()
 endif()
+if (CLASP_VERSION_TWEAK)
+	set(CLASP_VERSION_STRING "${CLASP_VERSION}-dev")
+else()
+	set(CLASP_VERSION_STRING "${CLASP_VERSION}")
+endif()
 configure_file(${header_path}/config.h.in ${CLASP_BINARY_DIR}/clasp/config.h @ONLY)
 
 set(header