-
-
Notifications
You must be signed in to change notification settings - Fork 690
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- This refactor moves out the graph classes to their own and provide implementations for the Node and Edge. Providing the implementations seem to allow for a nicer assertion. - Also, moved the game-of-life and dots-dsl in the track's config.json to sort the practice exercises by difficulty and then name.
- Loading branch information
Showing
12 changed files
with
326 additions
and
224 deletions.
There are no files selected for viewing
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 |
---|---|---|
@@ -1,4 +1,6 @@ | ||
# Instructions append | ||
|
||
The DSL uses method chaining. | ||
You can learn more about method chaining [here](https://www.geeksforgeeks.org/method-chaining-in-java-with-examples/). | ||
The graph is represented in the DSL by the `Graph` class. | ||
The implementation for the nodes and edges (represented by the `Node` and `Edge` classes respectively) are provided. | ||
|
||
For more details on the DSL's expected design, take a look at the test cases in `GraphTest.java`. | ||
Check failure on line 6 in exercises/practice/dot-dsl/.docs/instructions.append.md GitHub Actions / Lint Markdown filesTrailing spaces
|
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
108 changes: 0 additions & 108 deletions
108
exercises/practice/dot-dsl/.meta/src/reference/java/DotDsl.java
This file was deleted.
Oops, something went wrong.
48 changes: 48 additions & 0 deletions
48
exercises/practice/dot-dsl/.meta/src/reference/java/Edge.java
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,48 @@ | ||
import java.util.Collections; | ||
import java.util.Map; | ||
import java.util.Objects; | ||
|
||
/** | ||
* Represents an edge on the graph. | ||
* | ||
* NOTE: There is no need to change this file and is treated as read only by the Exercism test runners. | ||
*/ | ||
public final class Edge { | ||
private final String start; | ||
|
||
private final String end; | ||
|
||
private final Map<String, String> attributes; | ||
|
||
public Edge(String start, String end) { | ||
this.start = start; | ||
this.end = end; | ||
this.attributes = Collections.emptyMap(); | ||
} | ||
|
||
public Edge(String start, String end, Map<String, String> attributes) { | ||
this.start = start; | ||
this.end = end; | ||
this.attributes = Map.copyOf(attributes); | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
return Objects.hash(start, end, attributes); | ||
} | ||
|
||
@Override | ||
public boolean equals(Object obj) { | ||
if (obj instanceof Edge other) { | ||
return Objects.equals(other.start, start) | ||
&& Objects.equals(other.end, end) | ||
&& Objects.equals(other.attributes, attributes); | ||
} | ||
return false; | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
return "Edge [start=" + start + ", end=" + end + ", attributes=" + attributes + "]"; | ||
} | ||
} |
54 changes: 54 additions & 0 deletions
54
exercises/practice/dot-dsl/.meta/src/reference/java/Graph.java
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,54 @@ | ||
import java.util.ArrayList; | ||
import java.util.Collection; | ||
import java.util.Collections; | ||
import java.util.List; | ||
import java.util.Map; | ||
|
||
public class Graph { | ||
|
||
private final List<Node> nodes = new ArrayList<>(); | ||
|
||
private final List<Edge> edges = new ArrayList<>(); | ||
|
||
private final Map<String, String> attributes; | ||
|
||
public Graph() { | ||
this.attributes = Collections.emptyMap(); | ||
} | ||
|
||
public Graph(Map<String, String> attributes) { | ||
this.attributes = Map.copyOf(attributes); | ||
} | ||
|
||
public Collection<Node> getNodes() { | ||
return Collections.unmodifiableList(nodes); | ||
} | ||
|
||
public Collection<Edge> getEdges() { | ||
return Collections.unmodifiableList(edges); | ||
} | ||
|
||
public Graph node(String name) { | ||
nodes.add(new Node(name)); | ||
return this; | ||
} | ||
|
||
public Graph node(String name, Map<String, String> attributes) { | ||
nodes.add(new Node(name, attributes)); | ||
return this; | ||
} | ||
|
||
public Graph edge(String start, String end) { | ||
edges.add(new Edge(start, end)); | ||
return this; | ||
} | ||
|
||
public Graph edge(String start, String end, Map<String, String> attributes) { | ||
edges.add(new Edge(start, end, attributes)); | ||
return this; | ||
} | ||
|
||
public Map<String, String> getAttributes() { | ||
return attributes; | ||
} | ||
} |
43 changes: 43 additions & 0 deletions
43
exercises/practice/dot-dsl/.meta/src/reference/java/Node.java
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 @@ | ||
import java.util.Collections; | ||
import java.util.Map; | ||
import java.util.Objects; | ||
|
||
/** | ||
* Represents a node on the graph. | ||
* | ||
* NOTE: There is no need to change this file and is treated as read only by the Exercism test runners. | ||
*/ | ||
public final class Node { | ||
|
||
private final String name; | ||
|
||
private final Map<String, String> attributes; | ||
|
||
public Node(String name) { | ||
this.name = name; | ||
this.attributes = Collections.emptyMap(); | ||
} | ||
|
||
public Node(String name, Map<String, String> attributes) { | ||
this.name = name; | ||
this.attributes = Map.copyOf(attributes); | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
return Objects.hash(name, attributes); | ||
} | ||
|
||
@Override | ||
public boolean equals(Object obj) { | ||
if (obj instanceof Node other) { | ||
return Objects.equals(other.name, name) && Objects.equals(other.attributes, attributes); | ||
} | ||
return false; | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
return "Node [name=" + name + ", attributes=" + attributes + "]"; | ||
} | ||
} |
Oops, something went wrong.