Skip to content

Enhance the code of TreeTraversal and EuclideanAlgorithm for C# #120

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jun 28, 2018
Merged

Enhance the code of TreeTraversal and EuclideanAlgorithm for C# #120

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
522a058
Add all additional methods from TreeTraversalMdAdditional to TreeTrav…
june128 Jun 4, 2018
741f983
Delete redundant EuclideanAlgorithmMdAdditional.
june128 Jun 4, 2018
3134b20
Make EuclideanAlgorithm non-static.
june128 Jun 4, 2018
ed2415f
Make file be "ASCII text" instead of "UTF-8 Unicode (with BOM) text, …
june128 Jun 27, 2018
7041652
Provide explanation for commented lines of code.
june128 Jun 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .../EuclideanAlgorithm/EuclideanAlgorithm.cs → ...n_algorithm/code/cs/EuclideanAlgorithm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

namespace EuclideanAlgorithm
{
public static class EuclideanAlgorithm
public class EuclideanAlgorithm
{
public static int EuclidSub(int a, int b)
public int EuclidSub(int a, int b)
{
// Math.Abs for negative number support
a = Math.Abs(a);
Expand All @@ -22,7 +22,7 @@ public static int EuclidSub(int a, int b)
return a;
}

public static int EuclidMod(int a, int b)
public int EuclidMod(int a, int b)
{
// Math.Abs for negative number support
a = Math.Abs(a);
Expand Down
31 changes: 0 additions & 31 deletions ...lidean_algorithm/code/cs/EuclideanAlgorithmMdAdditional/EuclideanAlgorithmMdAdditional.cs
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions chapters/euclidean_algorithm/code/cs/EuclideanAlgorithmMdAdditional/Program.cs
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions ...thm/code/cs/EuclideanAlgorithm/Program.cs → ...rs/euclidean_algorithm/code/cs/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ class Program
static void Main(string[] args)
{
Console.WriteLine("EuclideanAlgorithm");
int check = EuclideanAlgorithm.EuclidMod(64 * 67, 64 * 81);
int check2 = EuclideanAlgorithm.EuclidSub(128 * 12, 128 * 77);
var euclideanAlgorithm = new EuclideanAlgorithm();
int check = euclideanAlgorithm.EuclidMod(64 * 67, 64 * 81);
int check2 = euclideanAlgorithm.EuclidSub(128 * 12, 128 * 77);

Console.WriteLine(check);
Console.WriteLine(check2);
Expand Down
8 changes: 4 additions & 4 deletions chapters/euclidean_algorithm/euclidean.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The algorithm is a simple way to find the *greatest common divisor* (GCD) of two
{% sample lang="c" %}
[import:17-30, lang="c_cpp"](code/c/euclidean_example.c)
{% sample lang="cs" %}
[import:6-17, lang="csharp"](code/cs/EuclideanAlgorithmMdAdditional/EuclideanAlgorithmMdAdditional.cs)
[import:8-23, lang="csharp"](code/cs/EuclideanAlgorithm.cs)
{% sample lang="clj" %}
[import:2-8, lang="clojure"](code/clojure/euclidean_example.clj)
{% sample lang="cpp" %}
Expand Down Expand Up @@ -39,7 +39,7 @@ Modern implementations, though, often use the modulus operator (%) like so
{% sample lang="c" %}
[import:4-16, lang="c_cpp"](code/c/euclidean_example.c)
{% sample lang="cs" %}
[import:19-29, lang="csharp"](code/cs/EuclideanAlgorithmMdAdditional/EuclideanAlgorithmMdAdditional.cs)
[import:25-39, lang="csharp"](code/cs/EuclideanAlgorithm.cs)
{% sample lang="clj" %}
[import:9-13, lang="clojure"](code/clojure/euclidean_example.clj)
{% sample lang="cpp" %}
Expand Down Expand Up @@ -75,9 +75,9 @@ The Euclidean Algorithm is truly fundamental to many other algorithms throughout
{% sample lang="cs" %}
### C# #
EuclideanAlgorithm.cs
[import, lang="csharp"](code/cs/EuclideanAlgorithm/EuclideanAlgorithm.cs)
[import, lang="csharp"](code/cs/EuclideanAlgorithm.cs)
Program.cs
[import, lang="csharp"](code/cs/EuclideanAlgorithm/Program.cs)
[import, lang="csharp"](code/cs/Program.cs)
{% sample lang="clj" %}
### Clojure
[import 2-20, lang="clojure"](code/clojure/euclidean_example.clj)
Expand Down
28 changes: 28 additions & 0 deletions chapters/tree_traversal/code/cs/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// submitted by Julian Schacher (jspp)
using System;

namespace TreeTraversal
{
class Program
{
static void Main(string[] args)
{
Console.WriteLine("TreeTraversal");
var tree = new Tree(3, 3);
Console.WriteLine("DFSRecursive:");
tree.DFSRecursive();
Console.WriteLine("DFSStack:");
tree.DFSStack();
Console.WriteLine("BFSQueue:");
tree.BFSQueue();
Console.WriteLine("DFSRecursivePostorder");
tree.DFSRecursivePostorder();

// Console.WriteLine("DFSRecursiveInorder (fail)");
// tree.DFSRecursiveInorderBinary();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these left over from a debugging session?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

People can uncomment that, to see, that the algorithm will throw an exception then (because the node has more than 2 children). After that a new Tree is created with only 2 children per node and the method can be used without problems.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In that case: What about a comment above these 2 lines that explains what you just explained here? Just something like // Uncomment these to see what happens if ....

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea. I'll do that.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

tree = new Tree(3, 2);
Console.WriteLine("DFSRecursiveInorder (succeed)");
tree.DFSRecursiveInorderBinary();
}
}
}
71 changes: 45 additions & 26 deletions chapters/tree_traversal/code/cs/Tree/Tree.cs → chapters/tree_traversal/code/cs/Tree.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,63 @@ private class Node
{
public List<Node> Children { get; set; } = new List<Node>();
public int Id { get; set; }

public Node(int id) => this.Id = id;
}

private Node root;

public Tree(int depthCount, int childrenCount)
{
CreateTree(depthCount, childrenCount);
root = new Node(1);
CreateAllChildren(root, depthCount, childrenCount);
}

public void CreateTree(int depthCount, int childrenCount)
public void DFSRecursive()
{
root = new Node
DFSRecursive(root);

void DFSRecursive(Node node)
{
Id = 1
};
CreateAllChildren(root, depthCount, childrenCount);
Console.WriteLine(node.Id);

foreach (var c in node.Children)
DFSRecursive(c);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a C# expert, but I'm pretty sure that omitting brackets for loops and conditions is dangerous no matter which language you're using.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Gustorn What do you think about that?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It can be dangerous, sure, but C#'s bracket style kinda encourages it. Having a single-line statement stretch into 3 eats up a lot of vertical space. I don't really mind either way but as long as it's a short, single line I think omitting the parens is fine

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I shall allow it, then.

}
}

public void StartDFSRecursive()
public void DFSRecursivePostorder()
{
DFSRecursive(root);
DFSRecursivePostorder(root);

void DFSRecursivePostorder(Node node)
{
foreach (var c in node.Children)
DFSRecursivePostorder(c);

Console.WriteLine(node.Id);
}
}

public void DFSRecursiveInorderBinary()
{
DFSRecursiveInorderBinary(root);

// This assumes only 2 children
void DFSRecursiveInorderBinary(Node node)
{
if (node.Children.Count > 2)
throw new Exception("Not binary tree!");

if (node.Children.Count > 0)
{
DFSRecursiveInorderBinary(node.Children[0]);
Console.WriteLine(node.Id);
DFSRecursiveInorderBinary(node.Children[1]);
}
else
Console.WriteLine(node.Id);
}
}

public void DFSStack()
Expand All @@ -45,9 +81,7 @@ public void DFSStack()
temp = stack.Pop();

foreach (var c in temp.Children)
{
stack.Push(c);
}
}
}

Expand All @@ -63,9 +97,7 @@ public void BFSQueue()
temp = queue.Dequeue();

foreach (var c in temp.Children)
{
queue.Enqueue(c);
}
}
}

Expand All @@ -76,22 +108,9 @@ private void CreateAllChildren(Node node, int rowCount, int childrenCount)

for (int i = 0; i < childrenCount; i++)
{
node.Children.Add(new Node
{
Id = node.Id * 10 + i + 1
});
node.Children.Add(new Node(node.Id * 10 + i + 1));
CreateAllChildren(node.Children[i], rowCount - 1, childrenCount);
}
}

private void DFSRecursive(Node node)
{
Console.WriteLine(node.Id);

foreach (var c in node.Children)
{
DFSRecursive(c);
}
}
}
}
20 changes: 0 additions & 20 deletions chapters/tree_traversal/code/cs/Tree/Program.cs
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions chapters/tree_traversal/code/cs/TreeMdAdditional/Program.cs
View file
Open in desktop

This file was deleted.

Loading