Version 4.0.0

.github/workflows/build-and-deploy.yml

@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: "3.10"
     - name: install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/test.yml

@@ -9,16 +9,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - python: 3.8
+          - python: "3.10"
             toxenv: flake8
             os: ubuntu-latest
-          - python: 3.8
+          - python: "3.10"
             toxenv: mypy
             os: ubuntu-latest
-          - python: 3.8
+          - python: "3.10"
             toxenv: pylint
             os: ubuntu-latest
-          - python: 3.8
+          - python: "3.10"
             toxenv: black
             os: ubuntu-latest
 
@@ -31,15 +31,21 @@ jobs:
           - python: "3.10"
             toxenv: py310
             os: ubuntu-latest
+          - python: "3.11"
+            toxenv: py311
+            os: ubuntu-latest
           - python: pypy-3.8
             toxenv: pypy38
             os: ubuntu-latest
+          - python: pypy-3.9
+            toxenv: pypy39
+            os: ubuntu-latest
 
-          - python: 3.8
-            toxenv: py38
+          - python: "3.10"
+            toxenv: py310
             os: macos-latest
-          - python: 3.8
-            toxenv: py38
+          - python: "3.10"
+            toxenv: py310
             os: windows-latest
 
     runs-on: ${{ matrix.os }}

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 21.10b0
+    rev: 22.10.0
     hooks:
       - id: black

CHANGELOG.md

@@ -4,7 +4,95 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+
+## Unreleased 
+
+## [4.0.0 - 2024-03-04]
+### Added
+- added `TileScopePack.requirement_and_row_and_col_placements`
+- `AssumptionAndPointJumpingFactory` which adds rules where requirements and/or
+  assumptions are swapped around a fusable row or column.
+- `PointJumpingFactory` which adds rules where requirements and assumptions can be
+swapped around a fusable row or column.
+- `MonotoneSlidingFactory` that creates rules that swaps neighbouring cells if they
+  are 'monotone' fusable, i.e., they are a generalized fusion with a monotone local
+  extra obstruction.
+- `DeflationFactory` which adds rules where cells can be deflated into increasing or
+  decreasing cells as obstructions can't occur across the sum/skew components in that
+  cell.
+- `CellReductionFactory` which changes a cell to monotone if at most one point of
+  any crossing gp touches that cell.
+- `PositiveCorroborationFactory` that inserts into cells which if positive makes
+  another cell empty. Also, the `PointCorroborationFactory`, which does this for
+  point or empty cells which is added to most packs.
+- `TargetedCellInsertionFactory` which inserts factors of gridded perms if it can
+  lead to factoring out a verified sub tiling.
+- `BasisPatternInsertionFactory` which inserts permutations which are contained in
+  every pattern in the basis
+- `ComponentVerificationStrategy` which is added to component fusion packs.
+- `ComponentToPointAssumptionStrategy` that changes component assumptions to point
+  assumptions. These strategies are yielded in `RearrangeAssumptionFactory`.
+- `StrategyPack.kitchen_sinkify` to add many experimental strategies to the pack
+- `SubobstructionInsertionFactory` that inserts subobstructions and the pack
+  `TileScopePack.subobstruction_placements` which uses it.
+- `FactorWithInterleavingStrategy.backward_map` so you can now generate permutation
+  from specifications using interleaving factors.
+- `DummyStrategy` that gives a quick template for making strategies.
+- `PointingStrategy`, `AssumptionPointingFactory` and `RequirementPointingFactory`
+  that place points directionless in non-point cells. This are a non-productive
+  strategy so should be used with `RuleDBForest`.
+- `UnfusionFactory` that unfuses either all the rows or columns. Also non-productive.
+- `FusableRowAndColumnPlacementFactory` places fusable rows and columns.
+- `TrackedClassDB` used by `TrackedSearcher`
+- counting for `GeneralizedSlidingStrategy` of rows (i.e., `rotate=True`)
+
+### Fixed
+- `Factor` was not factoring correctly with respect to component assumptions.
+- `ComponentAssumption` are flipped when taking symmetries
+- `Tiling.get_minimum_value` fixed for component assumptions
+- `RearrangeAssumptionFactory` will ignore component assumptions
+- `GriddedPermReduction.minimal_reqs` was removing requirements if they 
+  were duplicates.
+- `RequirementPlacement` algorithm didn't minimise obstructions correctly when
+  placing size 2 or higher gridded perms.
+- added missing condition in `MonotoneSlidingFactory` for consecutive 
+  values. Previous rules failing this condition will now raise 
+  `StrategyDoesNotApply` if it fails this condition.
+- `LocalVerificationStrategy` needs to be a `BasisAwareVerificationStrategy`
+- `PointJumping` maps component assumption to component assumptions.
+- `Tiling.all_symmetries` had a premature break statement that was removed
+- `shift_from_spec` method would previously fail if any tiling had two or 
+  more interleaving cells.
+
+### Changed
+- `TileScopePack.make_tracked` will add the appropriate tracking methods for
+  interleaving factors and make strategies tracked if it can be.
+- The `GriddedPermReduction` limits the size of obstructions it tries to infer in
+  the `minimal_obs` method to the size of the largest obstruction already on the
+  tiling.
+- The `SymmetriesFactory` takes a basis and will not return any symmetries where
+  any of the patterns of the obstruction are not subpatterns of some basis element.
+  If no basis is given, all symmetries are returned.
+- `RequirementPlacement` adds empty cells when placing a point cell. This saves
+  some inferral in partial placements.
+- Don't reinitialise in the `Tiling.from_dict` method.
+- `GuidedSearcher` expands every symmetry
+- `TileScopePack.pattern_placements` factors as an initial strategy.
+- `is_component` method of assumptions updated to consider cell decomposition
+- `AddAssumptionsStrategy.is_reverible` is now True when the assumption covers the
+  whole tiling.
+- The default behavior for `RequirementInsertion` is to allow insertion of factorable
+  requirements
+- `OneByOneVerificationStrategy` will look up permpal.com to find the generating
+  functions and min polys, and also use permpal specs for counting, sampling and
+  generating objects. 
+- The `kitchen_sinkify` function on `TileScopePack` now takes a level between 1 and 5
+  as input, which is used to determine how crazy the added strategies should be.
+
+### Removed
+- `AddInterleavingAssumptionsFactory`. The factor strategy now adds the relevant
+  assumptions where necessary directly, lowering the number of CVs needed.
+
 
 ## [3.1.0] - 2022-01-17
 ### Added

README.rst

@@ -573,7 +573,7 @@ You can make any pack use the fusion strategy by using the method
        >>> print(pack)
        Looking for recursive combinatorial specification with the strategies:
        Inferral: row and column separation, obstruction transitivity
-       Initial: rearrange assumptions, add assumptions, factor, tracked fusion
+       Initial: rearrange assumptions, add assumptions, factor, point corroboration, tracked fusion
        Verification: verify atoms, insertion encoding verified, one by one verification, locally factorable verification
        Set 1: row placement
 

mypy.ini

@@ -1,4 +1,5 @@
 [mypy]
+check_untyped_defs = True
 warn_return_any = True
 warn_unused_configs = True
 warn_no_return = False

pylintrc

@@ -28,7 +28,7 @@ limit-inference-results=100
 
 # List of plugins (as comma separated values of python module names) to load,
 # usually to register additional checkers.
-load-plugins=
+load-plugins=pylint.extensions.no_self_use
 
 # Pickle collected data for later comparisons.
 persistent=yes
@@ -63,6 +63,7 @@ confidence=
 disable=missing-class-docstring,
         too-few-public-methods,
         unsubscriptable-object, # Pylint does not support Genric class see https://github.com/PyCQA/pylint/issues/3520
+        wrong-import-order, # isort is taking care of import order for us
 
         cyclic-import,
         no-member,
@@ -75,88 +76,16 @@ disable=missing-class-docstring,
         inconsistent-return-statements,
         invalid-name,
         unused-argument,
-        bad-continuation,
         missing-function-docstring,
         missing-module-docstring,
-        print-statement,
-        parameter-unpacking,
-        unpacking-in-except,
-        old-raise-syntax,
-        backtick,
-        long-suffix,
-        old-ne-operator,
-        old-octal-literal,
-        import-star-module-level,
-        non-ascii-bytes-literal,
         raw-checker-failed,
         bad-inline-option,
         locally-disabled,
         file-ignored,
         suppressed-message,
         useless-suppression,
         deprecated-pragma,
-        use-symbolic-message-instead,
-        apply-builtin,
-        basestring-builtin,
-        buffer-builtin,
-        cmp-builtin,
-        coerce-builtin,
-        execfile-builtin,
-        file-builtin,
-        long-builtin,
-        raw_input-builtin,
-        reduce-builtin,
-        standarderror-builtin,
-        unicode-builtin,
-        xrange-builtin,
-        coerce-method,
-        delslice-method,
-        getslice-method,
-        setslice-method,
-        no-absolute-import,
-        old-division,
-        dict-iter-method,
-        dict-view-method,
-        next-method-called,
-        metaclass-assignment,
-        indexing-exception,
-        raising-string,
-        reload-builtin,
-        oct-method,
-        hex-method,
-        nonzero-method,
-        cmp-method,
-        input-builtin,
-        round-builtin,
-        intern-builtin,
-        unichr-builtin,
-        map-builtin-not-iterating,
-        zip-builtin-not-iterating,
-        range-builtin-not-iterating,
-        filter-builtin-not-iterating,
-        using-cmp-argument,
-        eq-without-hash,
-        div-method,
-        idiv-method,
-        rdiv-method,
-        exception-message-attribute,
-        invalid-str-codec,
-        sys-max-int,
-        bad-python3-import,
-        deprecated-string-function,
-        deprecated-str-translate-call,
-        deprecated-itertools-function,
-        deprecated-types-field,
-        next-method-defined,
-        dict-items-not-iterating,
-        dict-keys-not-iterating,
-        dict-values-not-iterating,
-        deprecated-operator-function,
-        deprecated-urllib-function,
-        xreadlines-attribute,
-        deprecated-sys-function,
-        exception-escape,
-        comprehension-escape
+        use-symbolic-message-instead
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
@@ -223,13 +152,6 @@ max-line-length=100
 # Maximum number of lines in a module.
 max-module-lines=1000
 
-# List of optional constructs for which whitespace checking is disabled. `dict-
-# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
-# `trailing-comma` allows a space between comma and closing bracket: (a, ).
-# `empty-line` allows space-only lines.
-no-space-check=trailing-comma,
-               dict-separator
-
 # Allow the body of a class to be on the same line as the declaration if body
 # contains single statement.
 single-line-class-stmt=no

setup.py

@@ -34,10 +34,10 @@ def get_version(rel_path):
     packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     long_description=read("README.rst"),
     install_requires=[
-        "comb-spec-searcher==4.1.0",
-        "permuta==2.2.0",
+        "comb-spec-searcher==4.2.0",
+        "permuta==2.3.0",
     ],
-    python_requires=">=3.7",
+    python_requires=">=3.8",
     include_package_data=True,
     classifiers=[
         "Development Status :: 5 - Production/Stable",