Skip to content

Commit 5accecf

Browse files
BLARGoMATICBLARGoMATIC
committed
Reapply "Merge branch 'master' of https://github.com/BLARGoMATIC/MathGraphics"
This reverts commit 0cd6454.
1 parent 0cd6454 commit 5accecf

15 files changed

Lines changed: 1304 additions & 21 deletions

‎.classpath‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5-
<classpathentry kind="output" path="bin"/>
3+
<classpathentry kind="src" output="target/classes" path="src">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
10+
<attributes>
11+
<attribute name="maven.pomderived" value="true"/>
12+
</attributes>
13+
</classpathentry>
14+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
15+
<attributes>
16+
<attribute name="maven.pomderived" value="true"/>
17+
</attributes>
18+
</classpathentry>
19+
<classpathentry kind="output" path="target/classes"/>
620
</classpath>

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@
2121

2222
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
2323
hs_err_pid*
24+
/target/
25+
.settings/org.eclipse.jdt.core.prefs
26+
.settings/org.eclipse.m2e.core.prefs

‎.project‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
1318
</buildSpec>
1419
<natures>
20+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
1521
<nature>org.eclipse.jdt.core.javanature</nature>
1622
</natures>
1723
</projectDescription>

‎bin/.gitignore‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎pom.xml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>MathGraphics</groupId>
4+
<artifactId>MathGraphics</artifactId>
5+
<version>0.0.1-SNAPSHOT</version>
6+
<build>
7+
<sourceDirectory>src</sourceDirectory>
8+
<plugins>
9+
<plugin>
10+
<artifactId>maven-compiler-plugin</artifactId>
11+
<version>3.8.0</version>
12+
<configuration>
13+
<source>1.8</source>
14+
<target>1.8</target>
15+
</configuration>
16+
</plugin>
17+
</plugins>
18+
</build>
19+
<dependencies>
20+
<dependency>
21+
<groupId>com.fasterxml.jackson.core</groupId>
22+
<artifactId>jackson-core</artifactId>
23+
<version>2.17.2</version>
24+
<type>module</type>
25+
</dependency>
26+
<dependency>
27+
<groupId>com.fasterxml.jackson.core</groupId>
28+
<artifactId>jackson-databind</artifactId>
29+
<version>2.17.2</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>com.fasterxml.jackson.core</groupId>
33+
<artifactId>jackson-annotations</artifactId>
34+
<version>2.17.2</version>
35+
</dependency>
36+
</dependencies>
37+
</project>

‎presets.json‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
[ {
2+
"name" : "Unrestricted Square",
3+
"equal" : false,
4+
"showIncrement" : true,
5+
"numSides, iterations, cMask, pMask" : [ 4, 10000000, 15, 15 ]
6+
}, {
7+
"name" : "Unrestricted Pentagon",
8+
"equal" : false,
9+
"showIncrement" : true,
10+
"numSides, iterations, cMask, pMask" : [ 5, 10000000, 31, 31 ]
11+
}, {
12+
"name" : "Unrestricted Hexagon",
13+
"equal" : false,
14+
"showIncrement" : true,
15+
"numSides, iterations, cMask, pMask" : [ 6, 10000000, 63, 63 ]
16+
}, {
17+
"name" : "Unrestricted Heptagon",
18+
"equal" : false,
19+
"showIncrement" : true,
20+
"numSides, iterations, cMask, pMask" : [ 7, 10000000, 127, 127 ]
21+
}, {
22+
"name" : "Unrestricted Octagon",
23+
"equal" : false,
24+
"showIncrement" : true,
25+
"numSides, iterations, cMask, pMask" : [ 8, 10000000, 255, 255 ]
26+
}, {
27+
"name" : "Unrestricted Nonagon",
28+
"equal" : false,
29+
"showIncrement" : true,
30+
"numSides, iterations, cMask, pMask" : [ 9, 10000000, 511, 511 ]
31+
}, {
32+
"name" : "Unrestricted Decagon",
33+
"equal" : false,
34+
"showIncrement" : true,
35+
"numSides, iterations, cMask, pMask" : [ 10, 10000000, 1023, 1023 ]
36+
}, {
37+
"name" : "Pentagon Faces",
38+
"equal" : false,
39+
"showIncrement" : true,
40+
"numSides, iterations, cMask, pMask" : [ 5, 10000000, 30, 31 ]
41+
}, {
42+
"name" : "Sierpinski Triangle",
43+
"equal" : false,
44+
"showIncrement" : true,
45+
"numSides, iterations, cMask, pMask" : [ 3, 10000000, 111, 111 ]
46+
}, {
47+
"name" : "Heptagonal Star",
48+
"equal" : false,
49+
"showIncrement" : true,
50+
"numSides, iterations, cMask, pMask" : [ 7, 10000000, 25, 25 ]
51+
}, {
52+
"name" : "Biohazard Nonagram",
53+
"equal" : true,
54+
"showIncrement" : true,
55+
"numSides, iterations, cMask, pMask" : [ 9, 10000000, 380, 491 ]
56+
}, {
57+
"name" : "Hexagonal Snowflake",
58+
"equal" : true,
59+
"showIncrement" : true,
60+
"numSides, iterations, cMask, pMask" : [ 6, 10000000, 43, 29 ]
61+
}, {
62+
"name" : "Octagonal Snowflake",
63+
"equal" : true,
64+
"showIncrement" : true,
65+
"numSides, iterations, cMask, pMask" : [ 8, 10000000, 125, 57 ]
66+
}, {
67+
"name" : "Chaos Square",
68+
"equal" : false,
69+
"showIncrement" : true,
70+
"numSides, iterations, cMask, pMask" : [ 4, 10000000, 12, 12 ]
71+
}, {
72+
"name" : "Hexagonal Twisted Star",
73+
"equal" : true,
74+
"showIncrement" : true,
75+
"numSides, iterations, cMask, pMask" : [ 6, 10000000, 47, 61 ]
76+
}, {
77+
"name" : "Octagonal Faces",
78+
"equal" : true,
79+
"showIncrement" : true,
80+
"numSides, iterations, cMask, pMask" : [ 8, 10000000, 186, 254 ]
81+
}, {
82+
"name" : "Rigid Octagram",
83+
"equal" : true,
84+
"showIncrement" : true,
85+
"numSides, iterations, cMask, pMask" : [ 8, 10000000, 57, 255 ]
86+
}, {
87+
"name" : "Octal Starfish",
88+
"equal" : true,
89+
"showIncrement" : true,
90+
"numSides, iterations, cMask, pMask" : [ 8, 10000000, 56, 110 ]
91+
}, {
92+
"name" : "Spiked Wheel",
93+
"equal" : true,
94+
"showIncrement" : true,
95+
"numSides, iterations, cMask, pMask" : [ 10, 10000000, 119, 841 ]
96+
}, {
97+
"name" : "Cool Decagram Thing",
98+
"equal" : false,
99+
"showIncrement" : true,
100+
"numSides, iterations, cMask, pMask" : [ 10, 10000000, 41, 72 ]
101+
}, {
102+
"name" : "Eldritch Squid",
103+
"equal" : false,
104+
"showIncrement" : true,
105+
"numSides, iterations, cMask, pMask" : [ 10, 10000000, 56, 16 ]
106+
}, {
107+
"name" : "Leafy Wreath",
108+
"equal" : true,
109+
"showIncrement" : true,
110+
"numSides, iterations, cMask, pMask" : [ 10, 10000000, 824, 285 ]
111+
}, {
112+
"name" : "Ninja Star",
113+
"equal" : true,
114+
"showIncrement" : true,
115+
"numSides, iterations, cMask, pMask" : [ 10, 10000000, 121, 950 ]
116+
} ]

0 commit comments

Comments
 (0)