-
Notifications
You must be signed in to change notification settings - Fork 82
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #407 from Bram-Hub/revert-405-dev
Revert "Master Push for Fall 22"
- Loading branch information
Showing
430 changed files
with
6,812 additions
and
2,938 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
bin/main/edu/rpi/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<section name="Workbench"> | ||
<section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart"> | ||
<item value="2" key="layout"/> | ||
<item value="true" key="group_libraries"/> | ||
<item value="<?xml version="1.0" encoding="UTF-8"?>
<packageExplorer group_libraries="1" layout="2" linkWithEditor="0" rootMode="1" workingSetName="Aggregate for window 1572401944462">
<customFilters userDefinedPatternsEnabled="false">
<xmlDefinedFilters>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.StaticsFilter" isEnabled="false"/>
<child filterId="org.eclipse.mylyn.java.ui.MembersFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter" isEnabled="true"/>
<child filterId="org.eclipse.m2e.MavenModuleFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.LibraryFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.FieldsFilter" isEnabled="false"/>
</xmlDefinedFilters>
</customFilters>
</packageExplorer>" | ||
key="memento"/> | ||
<item value="1" key="rootMode"/> | ||
<item value="false" key="linkWithEditor"/> | ||
</section> | ||
</section> |
43 changes: 43 additions & 0 deletions
43
.../.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.6.0.20150526-2032.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
<configuration scan="true"> | ||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | ||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> | ||
<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern> | ||
</encoder> | ||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter"> | ||
<level>OFF</level> <!-- change to DEBUG to mimic '-consolelog' behaviour --> | ||
</filter> | ||
</appender> | ||
|
||
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||
<File>${org.eclipse.m2e.log.dir}/0.log</File> | ||
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> | ||
<FileNamePattern>${org.eclipse.m2e.log.dir}/%i.log</FileNamePattern> | ||
<MinIndex>1</MinIndex> | ||
<MaxIndex>10</MaxIndex> | ||
</rollingPolicy> | ||
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> | ||
<MaxFileSize>100MB</MaxFileSize> | ||
</triggeringPolicy> | ||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> | ||
<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern> | ||
</encoder> | ||
</appender> | ||
|
||
<appender name="EclipseLog" class="org.eclipse.m2e.logback.appender.EclipseLogAppender"> | ||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter"> | ||
<level>WARN</level> | ||
</filter> | ||
</appender> | ||
|
||
<appender name="MavenConsoleLog" class="org.eclipse.m2e.logback.appender.MavenConsoleAppender"> | ||
</appender> | ||
|
||
<root level="INFO"> | ||
<appender-ref ref="FILE"/> | ||
<appender-ref ref="STDOUT"/> | ||
<appender-ref ref="EclipseLog"/> | ||
<appender-ref ref="MavenConsoleLog"/> | ||
</root> | ||
|
||
<logger name="com.ning.http.client" level="INFO"/> | ||
</configuration> |
11 changes: 11 additions & 0 deletions
11
bin/main/edu/rpi/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<section name="Workbench"> | ||
<section name="WORKBENCH_SETTINGS"> | ||
<list key="ENABLED_TRANSFERS"> | ||
</list> | ||
</section> | ||
<section name="ChooseWorkspaceDialogSettings"> | ||
<item value="216" key="DIALOG_X_ORIGIN"/> | ||
<item value="222" key="DIALOG_Y_ORIGIN"/> | ||
</section> | ||
</section> |
4 changes: 4 additions & 0 deletions
4
bin/main/edu/rpi/.metadata/.plugins/org.eclipse.ui.intro/dialog_settings.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<section name="Workbench"> | ||
<item value="1024" key="introLaunchBar.location"/> | ||
</section> |
15 changes: 15 additions & 0 deletions
15
bin/main/edu/rpi/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<section name="Workbench"> | ||
<section name="org.eclipse.ui.internal.QuickAccess"> | ||
<item value="657" key="dialogHeight"/> | ||
<item value="1050" key="dialogWidth"/> | ||
<list key="textEntries"> | ||
</list> | ||
<list key="orderedElements"> | ||
</list> | ||
<list key="orderedProviders"> | ||
</list> | ||
<list key="textArray"> | ||
</list> | ||
</section> | ||
</section> |
5 changes: 5 additions & 0 deletions
5
bin/main/edu/rpi/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<workingSetManager> | ||
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1572401944463_0" | ||
label="Window Working Set" name="Aggregate for window 1572401944462"/> | ||
</workingSetManager> |
11 changes: 11 additions & 0 deletions
11
bin/main/edu/rpi/legup/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<section name="Workbench"> | ||
<section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart"> | ||
<item value="2" key="layout"/> | ||
<item value="true" key="group_libraries"/> | ||
<item value="<?xml version="1.0" encoding="UTF-8"?>
<packageExplorer group_libraries="1" layout="2" linkWithEditor="0" rootMode="1" workingSetName="Aggregate for window 1571854382528">
<customFilters userDefinedPatternsEnabled="false">
<xmlDefinedFilters>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.StaticsFilter" isEnabled="false"/>
<child filterId="org.eclipse.mylyn.java.ui.MembersFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter" isEnabled="true"/>
<child filterId="org.eclipse.m2e.MavenModuleFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.LibraryFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.FieldsFilter" isEnabled="false"/>
</xmlDefinedFilters>
</customFilters>
</packageExplorer>" | ||
key="memento"/> | ||
<item value="1" key="rootMode"/> | ||
<item value="false" key="linkWithEditor"/> | ||
</section> | ||
</section> |
43 changes: 43 additions & 0 deletions
43
.../.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.6.0.20150526-2032.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
<configuration scan="true"> | ||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | ||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> | ||
<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern> | ||
</encoder> | ||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter"> | ||
<level>OFF</level> <!-- change to DEBUG to mimic '-consolelog' behaviour --> | ||
</filter> | ||
</appender> | ||
|
||
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||
<File>${org.eclipse.m2e.log.dir}/0.log</File> | ||
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> | ||
<FileNamePattern>${org.eclipse.m2e.log.dir}/%i.log</FileNamePattern> | ||
<MinIndex>1</MinIndex> | ||
<MaxIndex>10</MaxIndex> | ||
</rollingPolicy> | ||
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> | ||
<MaxFileSize>100MB</MaxFileSize> | ||
</triggeringPolicy> | ||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> | ||
<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern> | ||
</encoder> | ||
</appender> | ||
|
||
<appender name="EclipseLog" class="org.eclipse.m2e.logback.appender.EclipseLogAppender"> | ||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter"> | ||
<level>WARN</level> | ||
</filter> | ||
</appender> | ||
|
||
<appender name="MavenConsoleLog" class="org.eclipse.m2e.logback.appender.MavenConsoleAppender"> | ||
</appender> | ||
|
||
<root level="INFO"> | ||
<appender-ref ref="FILE"/> | ||
<appender-ref ref="STDOUT"/> | ||
<appender-ref ref="EclipseLog"/> | ||
<appender-ref ref="MavenConsoleLog"/> | ||
</root> | ||
|
||
<logger name="com.ning.http.client" level="INFO"/> | ||
</configuration> |
11 changes: 11 additions & 0 deletions
11
bin/main/edu/rpi/legup/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<section name="Workbench"> | ||
<section name="WORKBENCH_SETTINGS"> | ||
<list key="ENABLED_TRANSFERS"> | ||
</list> | ||
</section> | ||
<section name="ChooseWorkspaceDialogSettings"> | ||
<item value="216" key="DIALOG_X_ORIGIN"/> | ||
<item value="222" key="DIALOG_Y_ORIGIN"/> | ||
</section> | ||
</section> |
15 changes: 15 additions & 0 deletions
15
bin/main/edu/rpi/legup/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<section name="Workbench"> | ||
<section name="org.eclipse.ui.internal.QuickAccess"> | ||
<item value="-1" key="dialogHeight"/> | ||
<item value="-1" key="dialogWidth"/> | ||
<list key="textEntries"> | ||
</list> | ||
<list key="orderedElements"> | ||
</list> | ||
<list key="orderedProviders"> | ||
</list> | ||
<list key="textArray"> | ||
</list> | ||
</section> | ||
</section> |
5 changes: 5 additions & 0 deletions
5
bin/main/edu/rpi/legup/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<workingSetManager> | ||
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1571854382529_0" | ||
label="Window Working Set" name="Aggregate for window 1571854382528"/> | ||
</workingSetManager> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
## TODO | ||
|
||
- Implement board class (`SkyscrapersBoard.java`) | ||
- Implement clues class (`SkyscrapersClue.java`) | ||
- Implement cell generation (`SkyscrapersCellFactory.java`) | ||
- Implement puzzle exporter (`SkyscrapersExporter.java`) | ||
- Add way to interact with puzzle (`SkyscrapersCellController.java`) | ||
- Add vision (`SkyscrapersVision.java`, `SkyscrapersVisionView.java`) | ||
- Puzzle GUI (`SkyscrapersView.java`, `SkyscrapersElementView.java`, `SkyscrapersClueView.java`) | ||
- Determine if puzzle is solved | ||
- Add rules (see Sudoku and the powerpoint) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,16 @@ | ||
## TODO | ||
|
||
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 | ||
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 |
Oops, something went wrong.