Skip to content

Commit

Permalink
Migrate from QuickGraphCore package to QuikGraph. (#110)
Browse files Browse the repository at this point in the history
* Migrate from QuickGraphCore package to QuikGraph.

* Update to QuikGraph 2.1.0.

* Update to QuikGraph 2.2.0.

Co-authored-by: Alexander Smirnov <[email protected]>
  • Loading branch information
KeRNeLith and panthernet authored Nov 5, 2020
1 parent 69fcb14 commit 13cd49c
Show file tree
Hide file tree
Showing 107 changed files with 136 additions and 135 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using GraphX.Measure;
using GraphX.Common.Interfaces;
using GraphX.Logic.Algorithms.LayoutAlgorithms;
using QuickGraph;
using QuikGraph;

/*
External layout algorithm implementation example
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using GraphX.Common.Interfaces;
using QuickGraph;
using QuikGraph;

namespace ShowcaseApp.WPF.Filters
{
Expand Down
2 changes: 1 addition & 1 deletion Examples/ShowcaseApp.WPF/ExampleModels/GraphAreaExample.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using GraphX;
using GraphX.Controls;
using QuickGraph;
using QuikGraph;

namespace ShowcaseApp.WPF
{
Expand Down
2 changes: 1 addition & 1 deletion Examples/ShowcaseApp.WPF/ExampleModels/GraphExample.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using QuickGraph;
using QuikGraph;

namespace ShowcaseApp.WPF
{
Expand Down
2 changes: 1 addition & 1 deletion Examples/ShowcaseApp.WPF/ExampleModels/LogicCoreExample.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using GraphX.Logic.Models;
using QuickGraph;
using QuikGraph;

namespace ShowcaseApp.WPF
{
Expand Down
2 changes: 1 addition & 1 deletion Examples/ShowcaseApp.WPF/ExampleModels/OrthEr.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using GraphX.Measure;
using GraphX.Common.Interfaces;
using GraphX.Logic.Algorithms.EdgeRouting;
using QuickGraph;
using QuikGraph;

namespace ShowcaseApp.WPF.ExampleModels
{
Expand Down
2 changes: 1 addition & 1 deletion Examples/ShowcaseApp.WPF/Models/ShowcaseHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using QuickGraph;
using QuikGraph;

namespace ShowcaseApp.WPF.Models
{
Expand Down
2 changes: 1 addition & 1 deletion Examples/ShowcaseApp.WPF/Pages/Debug/DebugGraph.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
using GraphX.Logic.Algorithms.LayoutAlgorithms;
using GraphX.Logic.Algorithms.LayoutAlgorithms.Grouped;
using GraphX.Logic.Algorithms.OverlapRemoval;
using QuickGraph;
using QuikGraph;
using ShowcaseApp.WPF.Models;
using Rect = GraphX.Measure.Rect;

Expand Down
2 changes: 1 addition & 1 deletion Examples/ShowcaseApp.WPF/Pages/GeneralGraph.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using GraphX.Logic.Algorithms.EdgeRouting;
using GraphX.Logic.Algorithms.LayoutAlgorithms;
using Microsoft.Win32;
using QuickGraph;
using QuikGraph;
using ShowcaseApp.WPF.FileSerialization;
using ShowcaseApp.WPF.Models;
using Rect = GraphX.Measure.Rect;
Expand Down
2 changes: 1 addition & 1 deletion Examples/ShowcaseApp.WPF/Pages/Mini/LayoutGrouped.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using GraphX.Common.Enums;
using GraphX.Logic.Algorithms.LayoutAlgorithms;
using GraphX.Logic.Algorithms.LayoutAlgorithms.Grouped;
using QuickGraph;
using QuikGraph;
using ShowcaseApp.WPF.Models;
using Rect = GraphX.Measure.Rect;

Expand Down
6 changes: 3 additions & 3 deletions Examples/ShowcaseApp.WPF/ShowcaseApp.WPF.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -58,8 +58,8 @@
<Reference Include="Microsoft.Windows.Shell">
<HintPath>..\..\ExternalDlls\Microsoft.Windows.Shell.dll</HintPath>
</Reference>
<Reference Include="QuickGraph, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\QuickGraphCore.1.0.0\lib\net40\QuickGraph.dll</HintPath>
<Reference Include="QuikGraph, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\QuikGraph.2.2.0\lib\net40\QuikGraph.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down
4 changes: 2 additions & 2 deletions Examples/ShowcaseApp.WPF/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Accordion" version="1.0.0" targetFramework="net40-client" />
<package id="AvalonEdit" version="5.0.3" targetFramework="net40-client" />
<package id="QuickGraphCore" version="1.0.0" targetFramework="net40-client" />
<package id="QuikGraph" version="2.2.0" targetFramework="net40-client" />
<package id="YAXLib" version="2.14" targetFramework="net40-client" />
</packages>
4 changes: 2 additions & 2 deletions Examples/SimpleGraph.DotNetCore/SimpleGraph.DotNetCore.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<OutputType>WinExe</OutputType>
Expand Down Expand Up @@ -39,7 +39,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="QuickGraphCore" Version="1.0.0" />
<PackageReference Include="QuikGraph" Version="2.2.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Examples/SimpleGraph/Models/GXLogicCoreExample.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using GraphX.Logic.Models;
using QuickGraph;
using QuikGraph;

namespace SimpleGraph.Models
{
Expand Down
2 changes: 1 addition & 1 deletion Examples/SimpleGraph/Models/GraphAreaExample.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using GraphX.Controls;
using QuickGraph;
using QuikGraph;

namespace SimpleGraph.Models
{
Expand Down
2 changes: 1 addition & 1 deletion Examples/SimpleGraph/Models/GraphExample.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using QuickGraph;
using QuikGraph;

namespace SimpleGraph.Models
{
Expand Down
6 changes: 3 additions & 3 deletions Examples/SimpleGraph/SimpleGraph.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -75,8 +75,8 @@
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="QuickGraph, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\QuickGraphCore.1.0.0\lib\net40\QuickGraph.dll</HintPath>
<Reference Include="QuikGraph, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\QuikGraph.2.2.0\lib\net40\QuikGraph.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down
4 changes: 2 additions & 2 deletions Examples/SimpleGraph/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="QuickGraphCore" version="1.0.0" targetFramework="net40" />
<package id="QuikGraph" version="2.2.0" targetFramework="net40" />
</packages>
2 changes: 1 addition & 1 deletion Examples/UAP.SimpleGraph/Models/GXLogicCoreExample.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using GraphX.Logic.Models;
using QuickGraph;
using QuikGraph;

namespace UAP.SimpleGraph.Models
{
Expand Down
2 changes: 1 addition & 1 deletion Examples/UAP.SimpleGraph/Models/GraphAreaExample.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using GraphX.Controls;
using QuickGraph;
using QuikGraph;

namespace UAP.SimpleGraph.Models
{
Expand Down
2 changes: 1 addition & 1 deletion Examples/UAP.SimpleGraph/Models/GraphExample.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using QuickGraph;
using QuikGraph;

namespace UAP.SimpleGraph.Models
{
Expand Down
6 changes: 3 additions & 3 deletions Examples/UAP.SimpleGraph/UAP.SimpleGraph.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -173,8 +173,8 @@
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.9</Version>
</PackageReference>
<PackageReference Include="QuickGraphCore">
<Version>1.0.0</Version>
<PackageReference Include="QuikGraph">
<Version>2.2.0</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
Expand Down
2 changes: 1 addition & 1 deletion Examples/WindowsDesktop_VB.NET_WinForms_Example/Form1.vb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Imports GraphX.Logic.Algorithms.LayoutAlgorithms
Imports GraphX.Logic.Algorithms.OverlapRemoval
Imports GraphX.Logic.Models
Imports GraphX.Controls
Imports QuickGraph
Imports QuikGraph

Public Class Form1

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Imports GraphX.Controls
Imports QuickGraph
Imports QuikGraph

Namespace Models

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports QuickGraph
Imports QuikGraph

Namespace Models

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -54,8 +54,8 @@
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="QuickGraph, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\QuickGraphCore.1.0.0\lib\net40\QuickGraph.dll</HintPath>
<Reference Include="QuikGraph, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\QuikGraph.2.2.0\lib\net40\QuikGraph.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="QuickGraphCore" version="1.0.0" targetFramework="net48" />
<package id="QuikGraph" version="2.2.0" targetFramework="net40" />
</packages>
2 changes: 1 addition & 1 deletion Examples/WindowsFormsProject/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using GraphX.Logic.Models;
using GraphX.Controls;
using GraphX.Controls.Models;
using QuickGraph;
using QuikGraph;

namespace WindowsFormsProject
{
Expand Down
2 changes: 1 addition & 1 deletion Examples/WindowsFormsProject/Models/GraphAreaExample.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using GraphX;
using QuickGraph;
using QuikGraph;
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
2 changes: 1 addition & 1 deletion Examples/WindowsFormsProject/Models/GraphExample.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using QuickGraph;
using QuikGraph;
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
6 changes: 3 additions & 3 deletions Examples/WindowsFormsProject/WindowsFormsProject.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -59,8 +59,8 @@
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="QuickGraph, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\QuickGraphCore.1.0.0\lib\net40\QuickGraph.dll</HintPath>
<Reference Include="QuikGraph, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\QuikGraph.2.2.0\lib\net40\QuikGraph.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
4 changes: 2 additions & 2 deletions Examples/WindowsFormsProject/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="QuickGraphCore" version="1.0.0" targetFramework="net48" />
<package id="QuikGraph" version="2.2.0" targetFramework="net40" />
</packages>
2 changes: 1 addition & 1 deletion GraphX for .NET.sln
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Licenses", "Licenses", "{E3
Documents\Licenses\License.icons.txt = Documents\Licenses\License.icons.txt
Documents\Licenses\License.ModernUI.txt = Documents\Licenses\License.ModernUI.txt
Documents\Licenses\License.NodeXL.txt = Documents\Licenses\License.NodeXL.txt
Documents\Licenses\License.Quickgraph.txt = Documents\Licenses\License.Quickgraph.txt
Documents\Licenses\License.Quikgraph.txt = Documents\Licenses\License.Quikgraph.txt
Documents\Licenses\License.RelativeAnimatingContentControl.txt = Documents\Licenses\License.RelativeAnimatingContentControl.txt
Documents\Licenses\License.WPFExtensions.txt = Documents\Licenses\License.WPFExtensions.txt
Documents\Licenses\License.YAXLib.txt = Documents\Licenses\License.YAXLib.txt
Expand Down
2 changes: 1 addition & 1 deletion GraphX.Controls/Controls/GraphArea.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
using GraphX.Common.Models;
using GraphX.Controls.Models;
using GraphX.Common;
using QuickGraph;
using QuikGraph;
using Rect = GraphX.Measure.Rect;
using Size = GraphX.Measure.Size;

Expand Down
6 changes: 3 additions & 3 deletions GraphX.Controls/GraphX.WPF.Controls.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -68,8 +68,8 @@
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="PresentationFramework.Aero" />
<Reference Include="QuickGraph, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\QuickGraphCore.1.0.0\lib\net40\QuickGraph.dll</HintPath>
<Reference Include="QuikGraph, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\QuikGraph.2.2.0\lib\net40\QuikGraph.dll</HintPath>
</Reference>
<Reference Include="ReachFramework" />
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion GraphX.Controls/Models/StateStorage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using GraphX.Common.Exceptions;
using GraphX.Common.Interfaces;
using GraphX.Common.Models;
using QuickGraph;
using QuikGraph;
#if WPF
using System.Windows;
#elif METRO
Expand Down
4 changes: 2 additions & 2 deletions GraphX.Controls/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="QuickGraphCore" version="1.0.0" targetFramework="net40-client" />
<package id="QuikGraph" version="2.2.0" targetFramework="net40-client" />
</packages>
2 changes: 1 addition & 1 deletion GraphX.Core.Controls/GraphX.Core.Controls.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="QuickGraphCore" Version="1.0.0" />
<PackageReference Include="QuikGraph" Version="2.2.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions GraphX.Standard.Common/GraphX.Standard.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="QuickGraphCore" Version="1.0.0" />
<PackageReference Include="QuikGraph" Version="2.2.0" />
</ItemGroup>

</Project>
</Project>
6 changes: 3 additions & 3 deletions GraphX.Standard.Common/Helpers/GraphSharpExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
using System.Collections.Generic;
using System.Linq;
using GraphX.Common.Interfaces;
using QuickGraph;
using QuickGraph.Algorithms.ShortestPath;
using QuikGraph;
using QuikGraph.Algorithms.ShortestPath;

namespace GraphX.Common
{
Expand Down Expand Up @@ -199,7 +199,7 @@ public static double GetDiameter<TVertex, TEdge, TGraph>(this TGraph g, out doub
{
//compute the distances from the 'source'
var spaDijkstra =
new UndirectedDijkstraShortestPathAlgorithm<TVertex, TEdge>(undirected, edge => weights[edge], QuickGraph.Algorithms.DistanceRelaxers.ShortestDistance);
new UndirectedDijkstraShortestPathAlgorithm<TVertex, TEdge>(undirected, edge => weights[edge], QuikGraph.Algorithms.DistanceRelaxers.ShortestDistance);
spaDijkstra.Compute(source);

var j = 0;
Expand Down
Loading

0 comments on commit 13cd49c

Please sign in to comment.