Skip to content

Commit

Permalink
Merge pull request #408 from Bram-Hub/dev
Browse files Browse the repository at this point in the history
Fall 2022 Semester Push
  • Loading branch information
charlestian23 authored Jan 10, 2023
2 parents 9162f5f + fed252c commit 37a3ae2
Show file tree
Hide file tree
Showing 425 changed files with 4,325 additions and 6,322 deletions.
51 changes: 6 additions & 45 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,9 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# AWS User-specific
.idea/**/aws.xml

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

Expand All @@ -52,32 +23,19 @@ native/windows/bin/*
# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# SonarLint plugin
.idea/sonarlint/

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### Intellij+all Patch ###
# Ignore everything but code style settings and run configurations
# that are supposed to be shared within teams.

.idea/*

!.idea/codeStyles
!.idea/runConfigurations
**/.idea
!.idea/codeStyles/*
!.idea/runConfigurations/*

### Java ###
# Compiled class file
Expand Down Expand Up @@ -132,3 +90,6 @@ gradle-app.setting

**/.DS_Store
gradle/wrapper/gradle-wrapper.properties

# Visual Studio Code configs
.vscode/*

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions bin/main/edu/rpi/legup/legup/config
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<puzzle name="LightUp"
qualifiedClassName="edu.rpi.legup.puzzle.lightup.LightUp"
fileType=".xml"
fileCreationDisabled="false"/>
fileCreationDisabled="true"/>
<puzzle name="Masyu"
qualifiedClassName="edu.rpi.legup.puzzle.masyu.Masyu"
fileType=".xml"
Expand All @@ -30,7 +30,7 @@
fileCreationDisabled="true"/>
<puzzle name="Sudoku" qualifiedClassName="edu.rpi.legup.puzzle.sudoku.Sudoku"
fileType=".xml"
fileCreationDisabled="false"/>
fileCreationDisabled="true"/>
<puzzle name="TreeTent"
qualifiedClassName="edu.rpi.legup.puzzle.treetent.TreeTent"
fileType=".xml"
Expand Down
11 changes: 0 additions & 11 deletions bin/main/edu/rpi/legup/puzzle/skyscrapers/TODO.md

This file was deleted.

34 changes: 20 additions & 14 deletions bin/main/edu/rpi/legup/puzzle/skyscrapers/rules/TODO.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
## TODO

1. Basic Rules:
- Last Cell
- Last Number
- 1-Edge
- N-Edge
- Fixed Max
2. Contradiction Rules:
- Duplicate Number
- Unresolved Cell
- Exceeding Visibility
- Insufficient Visibility
3. Case Rules:
- Possible Contents
- Possible Places
spreadsheet : https://docs.google.com/spreadsheets/d/1l7aUZtavtysM8dtGnaEIXhBKMRGxekhnLIVoYIHYZi8/edit#gid=0

1. Basic Rules:
- Come up with better names for 1Edge and FixedMax, they are now more general
2. Contradiction Rules:
3. Case Rules:
- Don't highlight cells when selecting a row/col?
- (override draw() in SkyscrapersElementView)
4. Refactoring:
- document utility functions in the reference sheet, COMMENTS!
- review and identify dead code
- remove all these damn print statments (commented ones too if they aren't useful)
- Edit to allow blank clues
- Display flags somewhere
5. Flags
- edit exporter to include flags in xml file format (if needed)
6. Documentation
- UML diagram(s)
7. Merge Skyscrapers to dev
8. Add 5 more easy/med puzzles to skyscrapers
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,4 @@ task buildNativeWindows(type: Exec, dependsOn: 'createExe') {

repositories {
mavenCentral()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@
</cells>
</board>
</puzzle>
<Solved isSolved="false"/>
</Legup>
1 change: 1 addition & 0 deletions puzzles files/lightup/10x10 Easy/1514228
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@
</cells>
</board>
</puzzle>
<Solved isSolved="false"/>
</Legup>
1 change: 1 addition & 0 deletions puzzles files/lightup/10x10 Easy/1721067
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@
</cells>
</board>
</puzzle>
<Solved isSolved="false"/>
</Legup>
1 change: 1 addition & 0 deletions puzzles files/lightup/10x10 Easy/5403393
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
</cells>
</board>
</puzzle>
<Solved isSolved="false"/>
</Legup>
1 change: 1 addition & 0 deletions puzzles files/lightup/10x10 Easy/5774519
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
</cells>
</board>
</puzzle>
<Solved isSolved="false"/>
</Legup>
1 change: 1 addition & 0 deletions puzzles files/lightup/10x10 Easy/954498
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
</cells>
</board>
</puzzle>
<Solved isSolved="false"/>
</Legup>
1 change: 1 addition & 0 deletions puzzles files/lightup/10x10 Hard/5373598
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
</cells>
</board>
</puzzle>
<Solved isSolved="false"/>
</Legup>
1 change: 1 addition & 0 deletions puzzles files/lightup/10x10 Hard/573404
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
</cells>
</board>
</puzzle>
<Solved isSolved="false"/>
</Legup>
1 change: 1 addition & 0 deletions puzzles files/lightup/10x10 Hard/5787104
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@
</cells>
</board>
</puzzle>
<Solved isSolved="false"/>
</Legup>
Loading

0 comments on commit 37a3ae2

Please sign in to comment.