Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fixes for the Thermometer Bug Fixes #794

Merged
merged 44 commits into from
Apr 2, 2024

Commits on Jan 26, 2024

  1. Fixed Short Truth Table case rule bug (#707)

    * Revert "Bugfix 549 (#682)"
    
    This reverts commit 5048ee6.
    
    * Case rule test fix (#705)
    
    Co-authored-by: Chase Grajeda <[email protected]>
    
    * Rapid fix for STT case rules
    
    Case rules broke at some point from legacy code or merge conflict. Provided is a quick fix in CaseRule and CaseRule_Generic
    
    * Revert "Revert "Bugfix 549 (#682)"" (#706)
    
    This reverts commit e9fe310.
    
    ---------
    
    Co-authored-by: Chase-Grajeda <[email protected]>
    Co-authored-by: Chase Grajeda <[email protected]>
    3 people authored Jan 26, 2024
    Configuration menu
    Copy the full SHA
    653c816 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. Skyscrapers Test Suite (#708)

    * Simplify rule names
    
    * Contradiction Test Suite
    
    * checkstyle
    
    * Update Exporter
    
    * Revert "Update Exporter"
    
    This reverts commit bae1a1f.
    
    * Case Rule Test Suite
    
    * Update SkyscrapersExporter.java
    
    * allow null transitions
    
    * Update TreeTransition.java
    
    * Direct Rule Test Suite
    
    * added tests pass
    
    * Update DirectRule.java
    
    Commenting out print statement
    
    ---------
    
    Co-authored-by: ThisMatt <[email protected]>
    Co-authored-by: ThisMatt <[email protected]>
    Co-authored-by: Chase Grajeda <[email protected]>
    4 people authored Jan 30, 2024
    Configuration menu
    Copy the full SHA
    4608222 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. Skyscrapers puzzle editor (#720)

    * Fixed Short Truth Table case rule bug (#707)
    
    * Revert "Bugfix 549 (#682)"
    
    This reverts commit 5048ee6.
    
    * Case rule test fix (#705)
    
    Co-authored-by: Chase Grajeda <[email protected]>
    
    * Rapid fix for STT case rules
    
    Case rules broke at some point from legacy code or merge conflict. Provided is a quick fix in CaseRule and CaseRule_Generic
    
    * Revert "Revert "Bugfix 549 (#682)"" (#706)
    
    This reverts commit e9fe310.
    
    ---------
    
    Co-authored-by: Chase-Grajeda <[email protected]>
    Co-authored-by: Chase Grajeda <[email protected]>
    
    * Implementing Puzzle Editor
    
    Removing Extraneous TreeTent Code
    Allowing setting tile number
    
    * Allow for editing clues on all axies
    
    * Remove Extraneous Code
    
    Removed functionality required for TreeTent but unnecessary for Skyscrapers
    
    * Remove Extraneous Code
    
    * Clue Tile in Editor
    
    Editor now requires selecting the clue tile to edit clues
    Added images for the tiles
    
    * Merge branch 'dev' into skyscrapersPuzzleEditor
    
    * Checkstyle Requirement
    
    * Necessary Code
    
    * Allow for test functionality
    
    ---------
    
    Co-authored-by: Charles Tian <[email protected]>
    Co-authored-by: Chase-Grajeda <[email protected]>
    Co-authored-by: Chase Grajeda <[email protected]>
    4 people authored Feb 7, 2024
    Configuration menu
    Copy the full SHA
    80cb273 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. Configuration menu
    Copy the full SHA
    c2ab8d9 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Added Vial Class

    Added the vial class which will be helpful for checking rules down the line
    ZevCe committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    ca7de69 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. Configuration menu
    Copy the full SHA
    8c4ebc8 View commit details
    Browse the repository at this point in the history
  2. Discontinuous Mercury Rule added

    Added the Discontinuous Mercury contradiciton rule. Added variables to the ThermometerBoard class to keep track of the numbers on the perimiter of the board as well as accessors/setters for these variables. Rewrote a section of the Vials code to make sure cells are added correctly as well as added some accessor functions.
    ZevCe committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    07b85cd View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. Java Autoformatter (#728)

    * Create java-autoformat.yml
    
    * Setup Java
    
    * Run spotless on repository
    
    * Adding spotless dependency during build
    
    * Adding spotless dependency during build
    
    * Give permissions to run spotless
    
    * Syntax
    
    * Adding Debug Tag
    
    * Check for modified files
    
    Also removed debug tag
    
    * Automated Java code formatting changes
    
    * Test command syntax
    
    * Correctly Identify modified files
    
    * Test autoformatter
    
    * Test autoformatter
    
    * Test autoformatter
    
    * Debugging
    
    * Debugging
    
    * Change method for detecting changed files
    
    * Try building before calling spotless
    
    * Update java-autoformat.yml
    
    * Update java-autoformat.yml
    
    * Update java-autoformat.yml
    
    * Purposely bad formatting
    
    Purposely adding some bad formatting to see if the auto-formatter triggers
    
    * Update build.gradle
    
    Disabling Checkstyle in build so the auto-formatter can trigger
    
    * Update java-autoformat.yml
    
    Have auto-formatter trigger when more commits are added to a pull request
    
    * Debugging
    
    * Adding more awful formatting
    
    * Update java-autoformat.yml
    
    * Changing repo URL
    
    * Going back to checkout v1
    
    * Trying URL change
    
    * Trying out using env
    
    * Trying this now...?
    
    * Introducing more horrible changes
    
    * Spotless formatting using google format v1.19.2
    
    * Manual formatting fix
    
    * Automated Java code formatting changes
    
    * Different format type
    
    Trying to get it to pass checkstyle
    
    * Disable checkstyle temporarily
    
    * Automated Java code formatting changes
    
    * Default google formatting style
    
    * Automated Java code formatting changes
    
    * Comments and reordering styles
    
    * Adding extra newlines
    
    * Automated Java code formatting changes
    
    * Changing tabs from 2 to 4 spaces
    
    Supposedly the only difference that aosp makes is the 2 spaces?
    Hopefully it doesn't break anything else
    
    * Remove solo } requirement and reactivate checkstyle
    
    * Automated Java code formatting changes
    
    * Update checkstyle.xml
    
    Removed problematic LeftCurly and RightCurly requirements
    
    * Changing back to tabWidth
    
    * Add newline to test formatter + build
    
    * Automated Java code formatting changes
    
    * Trying some ChatGPT stuff
    
    * Getting rid of problematic experimentation
    
    ---------
    
    Co-authored-by: Bram van Heuveln <[email protected]>
    Co-authored-by: Charles Tian <[email protected]>
    Co-authored-by: charlestian23 <[email protected]>
    4 people authored Feb 21, 2024
    Configuration menu
    Copy the full SHA
    2190f7e View commit details
    Browse the repository at this point in the history
  2. Java21 (#714)

    * Fixed Short Truth Table case rule bug (#707)
    
    * Revert "Bugfix 549 (#682)"
    
    This reverts commit 5048ee6.
    
    * Case rule test fix (#705)
    
    Co-authored-by: Chase Grajeda <[email protected]>
    
    * Rapid fix for STT case rules
    
    Case rules broke at some point from legacy code or merge conflict. Provided is a quick fix in CaseRule and CaseRule_Generic
    
    * Revert "Revert "Bugfix 549 (#682)"" (#706)
    
    This reverts commit e9fe310.
    
    ---------
    
    Co-authored-by: Chase-Grajeda <[email protected]>
    Co-authored-by: Chase Grajeda <[email protected]>
    
    * Change Java version to 21 and setup JPackage to bundle Java with the app
    
    * Setup gradle action for java 21
    
    * Fix distribution in gradle.yml
    
    * Fix java version in tests
    
    * Fix java distribution in tests
    
    * Add jpackage task
    
    * Add Linux to jpackage task
    
    * Fix jpackage task
    
    * Add java setup to jpackage tasks
    
    * Separate build into separate tasks for different operating systems
    
    * Fix mac jpackage not working and changed names of artifacts
    
    * Potential macos installer build fix
    
    * Potential macos installer build fix attempt 2
    
    * Potential macos installer build fix attempt 3
    
    * Add quotes around executable name for macos installer
    
    * Add logo and shortcut prompt
    
    * Update version in build.gradle
    
    * Make installer name different to app (It's a weird way to do it, it renames the file in a gradle task).
    
    * Update java-autoformat.yml
    
    Added check to make sure the pull request is not from a fork
    
    ---------
    
    Co-authored-by: Charles Tian <[email protected]>
    Co-authored-by: Chase-Grajeda <[email protected]>
    Co-authored-by: Chase Grajeda <[email protected]>
    Co-authored-by: charlestian23 <[email protected]>
    5 people authored Feb 21, 2024
    Configuration menu
    Copy the full SHA
    b1e2f93 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ea6df89 View commit details
    Browse the repository at this point in the history
  4. Update build.gradle (#741)

    * Update build.gradle
    
    Fixing the deprecation issues in the autoformatter
    
    * Update build.gradle
    
    * Update build.gradle
    
    * Update to use Java 21
    
    * Automated Java code formatting changes
    
    ---------
    
    Co-authored-by: Bram van Heuveln <[email protected]>
    charlestian23 and Bram28 authored Feb 21, 2024
    Configuration menu
    Copy the full SHA
    2b036c0 View commit details
    Browse the repository at this point in the history
  5. Updating to version 6.0.0

    Changing to 6.0.0 since Java upgrade may break backwards compatibility
    charlestian23 committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    5189a0b View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Configuration menu
    Copy the full SHA
    898add4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e03c923 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. Merge pull request #740 from Bram-Hub/dev

    February dev merge
    Chase-Grajeda authored Feb 23, 2024
    Configuration menu
    Copy the full SHA
    32371ed View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. Configuration menu
    Copy the full SHA
    678da44 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b1e738a View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Importer written

    First draft of the importer written and setData refactored
    ZevCe committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    caeeef4 View commit details
    Browse the repository at this point in the history
  2. small bug fixes

    ZevCe committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    43d1305 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. Added Puzzle Factory and Importer

    Refactored a bunch of code so we now (in theory) import correctly
    ZevCe committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    cd124ea View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. Configuration menu
    Copy the full SHA
    e952533 View commit details
    Browse the repository at this point in the history
  2. Delete ThermometerExporter.java

    ZevCe committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    fea9223 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    20a4b4d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    cce8ee5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1fdc396 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f9fc1f5 View commit details
    Browse the repository at this point in the history
  7. Messing with Rule Recognition

    ZevCe committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    744df30 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    68b4f20 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Fixing desyncs in repo

    ZevCe committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    a62ec86 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d285afa View commit details
    Browse the repository at this point in the history
  3. Small misc improvements

    Further work on getting a file to open without errors
    ZevCe committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    cba0779 View commit details
    Browse the repository at this point in the history
  4. Fixed verify vial method

    ZevCe committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    0771835 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Configuration menu
    Copy the full SHA
    ae7359c View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. More work towards visual display

    we now have semi working tials!
    ZevCe committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    c74d877 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b7f906a View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Configuration menu
    Copy the full SHA
    9e2955f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3adeea9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    af47353 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    024778a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8a0109b View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Rotating images!!!!!

    ZevCe committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    f0d07af View commit details
    Browse the repository at this point in the history
  2. Added in placeable elements

    ZevCe committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    2a3aae6 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Stabilizing bug fixes

    ZevCe committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    997b7b4 View commit details
    Browse the repository at this point in the history
  2. Import silliness

    ZevCe committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    d9f9a4b View commit details
    Browse the repository at this point in the history