From 806096c17ae96fc13f2be8f3373f7e7cfe03dce4 Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Thu, 20 Feb 2020 18:43:25 -0800 Subject: [PATCH] remove Core namespace --- .circleci/config.yml | 2 +- Graph/DirectedGraph.cs | 2 +- Graph/DirectedMultiGraph.cs | 4 ++-- Graph/DirectedWeightedGraph.cs | 4 ++-- Graph/DirectedWeightedMultiGraph.cs | 4 ++-- Graph/Extensions/Unweighted.cs | 4 ++-- Graph/Extensions/Weighted.cs | 4 ++-- Graph/Extensions/WeightedMulti.cs | 4 ++-- Graph/Graph.cs | 4 ++-- Graph/GraphBuilder.cs | 4 ++-- Graph/Interfaces/IUnweightedGraph.cs | 4 ++-- Graph/Interfaces/IWeightedGraph.cs | 4 ++-- Graph/Interfaces/IWeightedMultiGraph.cs | 4 ++-- Graph/MoonTools.Core.Graph.csproj | 16 ++++++++-------- Graph/MultiGraph.cs | 4 ++-- Graph/NegativeCycleException.cs | 4 ++-- Graph/NegativeWeightException.cs | 4 ++-- Graph/SimpleGraph.cs | 4 ++-- Graph/UndirectedGraph.cs | 4 ++-- Graph/UndirectedWeightedGraph.cs | 4 ++-- Graph/Unit.cs | 2 +- MoonTools.Core.Graph.sln | 2 +- README.md | 8 ++++---- test/DirectedGraph.cs | 2 +- test/DirectedWeightedGraph.cs | 4 ++-- test/DirectedWeightedMultiGraph.cs | 4 ++-- test/GraphBuilder.cs | 4 ++-- test/UndirectedGraph.cs | 4 ++-- test/UndirectedWeightedGraph.cs | 4 ++-- test/test.csproj | 4 ++-- 30 files changed, 63 insertions(+), 63 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d707077..5fb00f6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,7 @@ jobs: - checkout - attach_workspace: at: . - - run: dotnet nuget push ./Graph/bin/Release/MoonTools.Core.Graph.*.nupkg -k $API_KEY -s https://api.nuget.org/v3/index.json + - run: dotnet nuget push ./Graph/bin/Release/MoonTools.Graph.*.nupkg -k $API_KEY -s https://api.nuget.org/v3/index.json workflows: version: 2 diff --git a/Graph/DirectedGraph.cs b/Graph/DirectedGraph.cs index bebde50..277aab4 100644 --- a/Graph/DirectedGraph.cs +++ b/Graph/DirectedGraph.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using Collections.Pooled; -namespace MoonTools.Core.Graph +namespace MoonTools.Graph { public class DirectedGraph : SimpleGraph, IUnweightedGraph where TNode : IEquatable { diff --git a/Graph/DirectedMultiGraph.cs b/Graph/DirectedMultiGraph.cs index 89a4aa6..124fc21 100644 --- a/Graph/DirectedMultiGraph.cs +++ b/Graph/DirectedMultiGraph.cs @@ -1,4 +1,4 @@ -namespace MoonTools.Core.Graph +namespace MoonTools.Graph { public class DirectedMultiGraph : MultiGraph, IUnweightedGraph where TNode : System.IEquatable { @@ -15,4 +15,4 @@ namespace MoonTools.Core.Graph } } } -} \ No newline at end of file +} diff --git a/Graph/DirectedWeightedGraph.cs b/Graph/DirectedWeightedGraph.cs index 48c606f..bf4e10a 100644 --- a/Graph/DirectedWeightedGraph.cs +++ b/Graph/DirectedWeightedGraph.cs @@ -4,7 +4,7 @@ using System.Linq; using Collections.Pooled; using MoreLinq; -namespace MoonTools.Core.Graph +namespace MoonTools.Graph { public class DirectedWeightedGraph : SimpleGraph, IWeightedGraph where TNode : System.IEquatable { @@ -245,4 +245,4 @@ namespace MoonTools.Core.Graph return ShortestPath(start, end, BellmanFordSingleSourceShortestPath); } } -} \ No newline at end of file +} diff --git a/Graph/DirectedWeightedMultiGraph.cs b/Graph/DirectedWeightedMultiGraph.cs index 3aa7b45..670923a 100644 --- a/Graph/DirectedWeightedMultiGraph.cs +++ b/Graph/DirectedWeightedMultiGraph.cs @@ -4,7 +4,7 @@ using System.Linq; using Collections.Pooled; using MoreLinq; -namespace MoonTools.Core.Graph +namespace MoonTools.Graph { public class DirectedWeightedMultiGraph : MultiGraph, IWeightedMultiGraph where TNode : IEquatable { @@ -266,4 +266,4 @@ namespace MoonTools.Core.Graph return ShortestPath(start, end, BellmanFordSingleSourceShortestPath); } } -} \ No newline at end of file +} diff --git a/Graph/Extensions/Unweighted.cs b/Graph/Extensions/Unweighted.cs index 1fe0e6d..cc80f6a 100644 --- a/Graph/Extensions/Unweighted.cs +++ b/Graph/Extensions/Unweighted.cs @@ -1,4 +1,4 @@ -namespace MoonTools.Core.Graph.Extensions +namespace MoonTools.Graph.Extensions { public static class UnweightedExtensions { @@ -15,4 +15,4 @@ namespace MoonTools.Core.Graph.Extensions } } } -} \ No newline at end of file +} diff --git a/Graph/Extensions/Weighted.cs b/Graph/Extensions/Weighted.cs index c7f576b..7613d26 100644 --- a/Graph/Extensions/Weighted.cs +++ b/Graph/Extensions/Weighted.cs @@ -1,4 +1,4 @@ -namespace MoonTools.Core.Graph.Extensions +namespace MoonTools.Graph.Extensions { public static class WeightedExtensions { @@ -15,4 +15,4 @@ namespace MoonTools.Core.Graph.Extensions } } } -} \ No newline at end of file +} diff --git a/Graph/Extensions/WeightedMulti.cs b/Graph/Extensions/WeightedMulti.cs index 400b030..211d0ad 100644 --- a/Graph/Extensions/WeightedMulti.cs +++ b/Graph/Extensions/WeightedMulti.cs @@ -1,4 +1,4 @@ -namespace MoonTools.Core.Graph.Extensions +namespace MoonTools.Graph.Extensions { public static class WeightedMultiExtensions { @@ -15,4 +15,4 @@ namespace MoonTools.Core.Graph.Extensions } } } -} \ No newline at end of file +} diff --git a/Graph/Graph.cs b/Graph/Graph.cs index 8e7be07..9c94c99 100644 --- a/Graph/Graph.cs +++ b/Graph/Graph.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Collections.Pooled; -namespace MoonTools.Core.Graph +namespace MoonTools.Graph { abstract public class Graph where TNode : System.IEquatable { @@ -63,4 +63,4 @@ namespace MoonTools.Core.Graph neighbors.Clear(); } } -} \ No newline at end of file +} diff --git a/Graph/GraphBuilder.cs b/Graph/GraphBuilder.cs index d06e848..8efcdeb 100644 --- a/Graph/GraphBuilder.cs +++ b/Graph/GraphBuilder.cs @@ -1,4 +1,4 @@ -namespace MoonTools.Core.Graph.Extensions +namespace MoonTools.Graph.Extensions { public static class GraphBuilder { @@ -32,4 +32,4 @@ namespace MoonTools.Core.Graph.Extensions return new UndirectedWeightedGraph(); } } -} \ No newline at end of file +} diff --git a/Graph/Interfaces/IUnweightedGraph.cs b/Graph/Interfaces/IUnweightedGraph.cs index 768c808..2f56455 100644 --- a/Graph/Interfaces/IUnweightedGraph.cs +++ b/Graph/Interfaces/IUnweightedGraph.cs @@ -1,7 +1,7 @@ -namespace MoonTools.Core.Graph +namespace MoonTools.Graph { public interface IUnweightedGraph { void AddEdge(TNode v, TNode u, TEdgeData edgeData); } -} \ No newline at end of file +} diff --git a/Graph/Interfaces/IWeightedGraph.cs b/Graph/Interfaces/IWeightedGraph.cs index b37cb73..92ef81b 100644 --- a/Graph/Interfaces/IWeightedGraph.cs +++ b/Graph/Interfaces/IWeightedGraph.cs @@ -1,7 +1,7 @@ -namespace MoonTools.Core.Graph +namespace MoonTools.Graph { public interface IWeightedGraph { void AddEdge(TNode v, TNode u, int weight, TEdgeData edgeData); } -} \ No newline at end of file +} diff --git a/Graph/Interfaces/IWeightedMultiGraph.cs b/Graph/Interfaces/IWeightedMultiGraph.cs index 8af2ceb..fa229f2 100644 --- a/Graph/Interfaces/IWeightedMultiGraph.cs +++ b/Graph/Interfaces/IWeightedMultiGraph.cs @@ -1,7 +1,7 @@ -namespace MoonTools.Core.Graph +namespace MoonTools.Graph { public interface IWeightedMultiGraph { System.Guid AddEdge(TNode v, TNode u, int weight, TEdgeData edgeData); } -} \ No newline at end of file +} diff --git a/Graph/MoonTools.Core.Graph.csproj b/Graph/MoonTools.Core.Graph.csproj index 95a7953..4bc93b5 100644 --- a/Graph/MoonTools.Core.Graph.csproj +++ b/Graph/MoonTools.Core.Graph.csproj @@ -2,20 +2,20 @@ 1.0.0 netstandard2.0 - A GC-friendly graph theory library for .NET Core intended for use with games. - MoonTools.Core.Graph - MoonTools.Core.Graph + A GC-friendly graph theory library for .NET Standard intended for use with games. + MoonTools.Graph + MoonTools.Graph Moonside Games Evan Hemsley - Evan Hemsley 2019 - MoonTools.Core.Graph + Evan Hemsley 2020 + MoonTools.Graph true - MoonTools.Core.Graph + MoonTools.Graph LGPL-3.0-only - https://github.com/MoonsideGames/MoonTools.Core.Graph + https://gitea.moonside.games/MoonsideGames/MoonTools.Graph - \ No newline at end of file + diff --git a/Graph/MultiGraph.cs b/Graph/MultiGraph.cs index b37fa6d..f097b72 100644 --- a/Graph/MultiGraph.cs +++ b/Graph/MultiGraph.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace MoonTools.Core.Graph +namespace MoonTools.Graph { abstract public class MultiGraph : Graph where TNode : System.IEquatable { @@ -69,4 +69,4 @@ namespace MoonTools.Core.Graph return edgeToEdgeData[id]; } } -} \ No newline at end of file +} diff --git a/Graph/NegativeCycleException.cs b/Graph/NegativeCycleException.cs index b71aa2e..562e5b9 100644 --- a/Graph/NegativeCycleException.cs +++ b/Graph/NegativeCycleException.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.Serialization; -namespace MoonTools.Core.Graph +namespace MoonTools.Graph { [Serializable] public class NegativeCycleException : Exception @@ -22,4 +22,4 @@ namespace MoonTools.Core.Graph { } } -} \ No newline at end of file +} diff --git a/Graph/NegativeWeightException.cs b/Graph/NegativeWeightException.cs index 4aa2ca4..da3344e 100644 --- a/Graph/NegativeWeightException.cs +++ b/Graph/NegativeWeightException.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.Serialization; -namespace MoonTools.Core.Graph +namespace MoonTools.Graph { [Serializable] public class NegativeWeightException : Exception @@ -22,4 +22,4 @@ namespace MoonTools.Core.Graph { } } -} \ No newline at end of file +} diff --git a/Graph/SimpleGraph.cs b/Graph/SimpleGraph.cs index 28e639f..c36d386 100644 --- a/Graph/SimpleGraph.cs +++ b/Graph/SimpleGraph.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace MoonTools.Core.Graph +namespace MoonTools.Graph { abstract public class SimpleGraph : Graph where TNode : System.IEquatable { @@ -49,4 +49,4 @@ namespace MoonTools.Core.Graph edgeToEdgeData.Clear(); } } -} \ No newline at end of file +} diff --git a/Graph/UndirectedGraph.cs b/Graph/UndirectedGraph.cs index 986be2d..7b27b01 100644 --- a/Graph/UndirectedGraph.cs +++ b/Graph/UndirectedGraph.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Collections.Generic; using Collections.Pooled; -namespace MoonTools.Core.Graph +namespace MoonTools.Graph { public class UndirectedGraph : DirectedGraph, IUnweightedGraph where TNode : System.IEquatable { @@ -103,4 +103,4 @@ namespace MoonTools.Core.Graph return nodeList.All(node => nodeList.All(other => Neighbors(node).Contains(other) || node.Equals(other))); } } -} \ No newline at end of file +} diff --git a/Graph/UndirectedWeightedGraph.cs b/Graph/UndirectedWeightedGraph.cs index ddc1bed..922d9fa 100644 --- a/Graph/UndirectedWeightedGraph.cs +++ b/Graph/UndirectedWeightedGraph.cs @@ -1,4 +1,4 @@ -namespace MoonTools.Core.Graph +namespace MoonTools.Graph { public class UndirectedWeightedGraph : DirectedWeightedGraph, IWeightedGraph where TNode : System.IEquatable { @@ -16,4 +16,4 @@ namespace MoonTools.Core.Graph } } } -} \ No newline at end of file +} diff --git a/Graph/Unit.cs b/Graph/Unit.cs index dc8c373..624a4e4 100644 --- a/Graph/Unit.cs +++ b/Graph/Unit.cs @@ -1,4 +1,4 @@ -namespace MoonTools.Core.Graph +namespace MoonTools.Graph { public struct Unit { } } diff --git a/MoonTools.Core.Graph.sln b/MoonTools.Core.Graph.sln index ae1de26..620dd23 100644 --- a/MoonTools.Core.Graph.sln +++ b/MoonTools.Core.Graph.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26124.0 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoonTools.Core.Graph", "Graph\MoonTools.Core.Graph.csproj", "{424ACD00-5613-4DBF-8D79-6509D7841D8A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoonTools.Graph", "Graph\MoonTools.Graph.csproj", "{424ACD00-5613-4DBF-8D79-6509D7841D8A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test", "test\test.csproj", "{423B5FFF-5B19-4D1C-ACF7-B5908E3E50EA}" EndProject diff --git a/README.md b/README.md index e4d8856..e3affa0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# MoonTools.Core.Graph +# MoonTools.Graph -[![NuGet Badge](https://buildstats.info/nuget/MoonTools.Core.Graph)](https://www.nuget.org/packages/MoonTools.Core.Graph/) -[![CircleCI](https://circleci.com/gh/MoonsideGames/MoonTools.Core.Graph.svg?style=svg)](https://circleci.com/gh/MoonsideGames/MoonTools.Core.Graph) +[![NuGet Badge](https://buildstats.info/nuget/MoonTools.Graph)](https://www.nuget.org/packages/MoonTools.Graph/) +[![CircleCI](https://circleci.com/gh/MoonsideGames/MoonTools.Graph.svg?style=svg)](https://circleci.com/gh/MoonsideGames/MoonTools.Graph) A GC-friendly graph theory library for C# intended for use with games. @@ -25,4 +25,4 @@ A GC-friendly graph theory library for C# intended for use with games. * change Edge id from a Guid to an integer index on the edge * Prim Minimum Spanning Tree * Kruskal Minimum Spanning Tree -* Undirected Weighted Multigraph \ No newline at end of file +* Undirected Weighted Multigraph diff --git a/test/DirectedGraph.cs b/test/DirectedGraph.cs index 830fae5..8fdf8b0 100644 --- a/test/DirectedGraph.cs +++ b/test/DirectedGraph.cs @@ -4,7 +4,7 @@ using FluentAssertions; using System; using System.Linq; -using MoonTools.Core.Graph; +using MoonTools.Graph; namespace Tests { diff --git a/test/DirectedWeightedGraph.cs b/test/DirectedWeightedGraph.cs index 825c5a3..a7d4580 100644 --- a/test/DirectedWeightedGraph.cs +++ b/test/DirectedWeightedGraph.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using FluentAssertions; -using MoonTools.Core.Graph; +using MoonTools.Graph; using System; using System.Linq; @@ -533,4 +533,4 @@ namespace Tests .BeEmpty(); } } -} \ No newline at end of file +} diff --git a/test/DirectedWeightedMultiGraph.cs b/test/DirectedWeightedMultiGraph.cs index 699c17c..a84c23a 100644 --- a/test/DirectedWeightedMultiGraph.cs +++ b/test/DirectedWeightedMultiGraph.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using FluentAssertions; -using MoonTools.Core.Graph; +using MoonTools.Graph; using System.Linq; namespace Tests @@ -489,4 +489,4 @@ namespace Tests myGraph.Invoking(x => x.BellmanFordShortestPath('a', 'z').Count()).Should().Throw(); } } -} \ No newline at end of file +} diff --git a/test/GraphBuilder.cs b/test/GraphBuilder.cs index ceeda74..e594a28 100644 --- a/test/GraphBuilder.cs +++ b/test/GraphBuilder.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using FluentAssertions; -using MoonTools.Core.Graph.Extensions; +using MoonTools.Graph.Extensions; namespace Tests { @@ -123,4 +123,4 @@ namespace Tests undirectedWeightedGraph.Weight(4, 1).Should().Be(2); } } -} \ No newline at end of file +} diff --git a/test/UndirectedGraph.cs b/test/UndirectedGraph.cs index 8b63ad6..dc1de45 100644 --- a/test/UndirectedGraph.cs +++ b/test/UndirectedGraph.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using FluentAssertions; -using MoonTools.Core.Graph; +using MoonTools.Graph; namespace Tests { @@ -131,4 +131,4 @@ namespace Tests graph.Bipartite.Should().BeFalse(); } } -} \ No newline at end of file +} diff --git a/test/UndirectedWeightedGraph.cs b/test/UndirectedWeightedGraph.cs index d0c93be..e170f2a 100644 --- a/test/UndirectedWeightedGraph.cs +++ b/test/UndirectedWeightedGraph.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using FluentAssertions; -using MoonTools.Core.Graph; +using MoonTools.Graph; using System; using System.Linq; @@ -354,4 +354,4 @@ namespace Tests .BeEmpty(); } } -} \ No newline at end of file +} diff --git a/test/test.csproj b/test/test.csproj index 243ce77..5cd97ab 100644 --- a/test/test.csproj +++ b/test/test.csproj @@ -10,6 +10,6 @@ - + - \ No newline at end of file +