Merge branch 'main' into stable/2026

Author: bradbell

2DO

@@ -1,4 +1,4 @@
-1. In variable.csv, change from Lagrange multipliers to grandient of objective.
+1. In variable.csv, change from Lagrange multipliers to gradient of objective.
 
 2. In asymptotic statistics, automatically detect which inequality constraint are active and treat like equality constraints.
 

CMakeLists.txt

@@ -21,7 +21,7 @@
 # required_definition( variable type docstring )
 #
 # variable
-# If this varaible is defined, echo its definition in the output.
+# If this variable is defined, echo its definition in the output.
 # Otherwise output a fatal error message.
 #
 # type
@@ -168,7 +168,7 @@ list(FIND
    isSystemDir
 )
 if("${isSystemDir}" STREQUAL "-1")
-   set(CMAKE_INSTALL_RPATH "${dismod_at_pefix}/${cmake_libdir}")
+   set(CMAKE_INSTALL_RPATH "${dismod_at_prefix}/${cmake_libdir}")
 endif("${isSystemDir}" STREQUAL "-1")
 # ----------------------------------------------------------------------------
 # package information for: gsl, eigen, ipopt, cppad_mixed, cppad, CHOLMOD
@@ -187,7 +187,7 @@ FOREACH(pkg gsl eigen3 ipopt cppad_mixed cppad CHOLMOD)
          MESSAGE(FATAL_ERROR  "PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH}")
       ENDIF( )
    ENDIF( ${pkg}_FOUND )
-   # INLCUDE_DIRECTORIES
+   # INCLUDE_DIRECTORIES
    IF( ${pkg} STREQUAL "eigen3" )
       INCLUDE_DIRECTORIES( SYSTEM ${eigen3_INCLUDE_DIRS} )
    ELSE( ${pkg} STREQUAL "eigen3" )
@@ -208,7 +208,7 @@ INCLUDE_DIRECTORIES( ${SQLite3_INCLUDE_DIRS} )
 #
 # package information for: CHOLMOD
 # The cppad_mixed.hpp file includes cholmod.h so this is needed.
-# Fedora 42 uses CHOLMOD.pc (above) becasue FIND_PACKAGE(CHOLMOD) is broken
+# Fedora 42 uses CHOLMOD.pc (above) because FIND_PACKAGE(CHOLMOD) is broken
 IF( "$CHOLMOD_INDLUDE_DIR" STREQUAL "NOTFOUND" )
    FIND_PACKAGE(CHOLMOD)
    INCLUDE_DIRECTORIES( "${CHOLMOD_INCLUDE_DIR}" )

bin/check_all.sh

@@ -34,7 +34,7 @@ possible flags
 --verbose_make             generate verbose makefiles
 --skip_check_copy          do not check copyright messages
 --skip_external_links      do not check documentation external links
---suppress_spell_warnings  do not check for documentaiton spelling errors
+--suppress_spell_warnings  do not check for documentation spelling errors
 EOF
       exit 0
    fi

bin/check_configure.sh

@@ -37,7 +37,7 @@ do
    fi
    if [ "$required" == 'no' ] && [ "$present" == 'yes' ]
    then
-      echo "unecessary: # include <dismod_at/configure.hpp>"
+      echo "unnecessary: # include <dismod_at/configure.hpp>"
       echo "  $file"
       exit 1
    fi

bin/check_install.sh

@@ -38,7 +38,7 @@ then
 fi
 if [ "$site_packages" != '' ]
 then
-   echo_eval rm -rf $pyton_dir/dismod_at
+   echo_eval rm -rf $python_dir/dismod_at
 fi
 #
 # bin_dir

bin/check_version.sh

@@ -5,7 +5,7 @@ set -e -u
 # SPDX-FileCopyrightText: Bradley M. Bell <bradbell@seanet.com>
 # SPDX-FileContributor: 2020-26 Bradley M. Bell
 # -----------------------------------------------------------------------------
-# bin/check_verison.sh
+# bin/check_version.sh
 # Checks that the version number in the version_file_list are correct;
 # see bin/dev_settings.sh for more discussion.
 # -----------------------------------------------------------------------------

bin/csv_summary.py

@@ -33,7 +33,7 @@ def read_file(file_name) :
       table.append(row)
    return table
 #
-# avgerage
+# average
 def average(table, variable_column, value_column) :
    avg  = dict()
    count = dict()
@@ -130,7 +130,7 @@ def weighted_average_residual(data_table) :
 print_variable( 'count', count )
 print()
 # --------------------------------------------------------------------------
-# rate_fit_valeu, rate_mean_value, rate_residual
+# rate_fit_value, rate_mean_value, rate_residual
 table = table_dict['variable']
 table = subsample(table, 'var_type', 'rate')
 (avg, count) = average(table, 'rate', 'fit_value')

bin/dock_dismod_at.sh

@@ -198,10 +198,10 @@ then
    if [ "$driver" == 'docker' ]
    then
 cat << EOF
-If docker deamon is not running perhaps one of the following will start it:
+If docker daemon is not running perhaps one of the following will start it:
    sudo systemctl start docker
    sudo service docker start
-If it is a premission problem perhaps one of the following will get permission:
+If it is a permission problem perhaps one of the following will get permission:
    sudo groupadd docker
    sudo usermod -aG docker $USER
 then log out and long back on this system.
@@ -322,7 +322,7 @@ cat << EOF > Dockerfile
 FROM dismod_at.mixed.$build_type
 WORKDIR /home/dismod_at.git
 #
-# Check soruce
+# Check source
 RUN \
 mv bin/install_settings.py temp.py && \
 git checkout --quiet $dismod_at_hash  && \

bin/new_release.sh

@@ -13,8 +13,8 @@ set -e -u
 # new_release.sh uses --skip_external_links when testing before the
 # new release (tag)  exists.
 # -----------------------------------------------------------------------------
-year='2025' # Year for this stable version
-release='2' # first release for each year starts with 0
+year='2026' # Year for this stable version
+release='0' # first release for each year starts with 0
 # -----------------------------------------------------------------------------
 if [ "$0" != 'bin/new_release.sh' ]
 then

bin/run_cmake.sh

@@ -11,7 +11,7 @@ echo_eval() {
 }
 # -----------------------------------------------------------------------------
 #
-# buld_type, verbose_makefile
+# build_type, verbose_makefile
 # dismod_at_prefix
 # python3_executable
 # specific_compiler