Skip to content

1.3.0 - merge, and License change #30

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
aersida merged 22 commits into from
Dec 29, 2023
Merged

1.3.0 - merge, and License change #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5a2454f
File Merge
aersida Dec 13, 2023
ad9a5ae
First technique tried
aersida Dec 19, 2023
2fea951
Looks like a contender
aersida Dec 20, 2023
fc05711
Housekeeping
aersida Dec 20, 2023
6fbf8f0
Merge branch 'master' into 1.3.0
aersida Dec 22, 2023
a07293b
Merge branch 'master' into 1.3.0
aersida Dec 22, 2023
dcb782c
Better seed pairing
aersida Dec 26, 2023
84f501d
A LOT better
aersida Dec 26, 2023
7117727
and nodelist rotation
aersida Dec 26, 2023
4ae1c24
Refactor out algorithm better
aersida Dec 27, 2023
bf0fbe7
WIP - refactor and merge files
aersida Dec 27, 2023
46f4514
builds OK
aersida Dec 27, 2023
545bd67
File Merge - travelling salesman
aersida Dec 27, 2023
8e800dd
updated tests
aersida Dec 27, 2023
f238b2d
Improved Split and Merge
aersida Dec 28, 2023
39d5f91
Support recleaning
aersida Dec 28, 2023
11c8a6e
temp removal of EliminateNeedlessTravelling
aersida Dec 28, 2023
d2dca22
SplitFile improvements
aersida Dec 28, 2023
0841f7a
Changin License
aersida Dec 29, 2023
368e426
Swapped out spectre console
aersida Dec 29, 2023
5220da1
Complete License change
aersida Dec 29, 2023
260d45b
Merge branch 'master' into 1.3.0
aersida Dec 29, 2023
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
2 changes: 1 addition & 1 deletion BuildItYourself.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ The `dotnet restore` command above gets the runtimes for `linux-x64`, `linux-arm

## License

This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details
This project is licensed under the AGPL License - see the [LICENSE](LICENSE) file for details
2 changes: 1 addition & 1 deletion GCodeClean.Tests/Dedup.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2020-2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System;
using System.Collections.Generic;
Expand Down
4 changes: 2 additions & 2 deletions GCodeClean.Tests/Line.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2021 - Lee HUMPHRIES (lee@md8n.com) and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Copyright (c) 2021-2023 - Lee HUMPHRIES (lee@md8n.com) and contributors. All rights reserved.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using GCodeClean.Structure;

Expand Down
3 changes: 1 addition & 2 deletions GCodeClean.Tests/Merge.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2023 - Lee HUMPHRIES (lee@md8n.com) and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System.Collections.Generic;
using System.Linq;
Expand All @@ -8,7 +8,6 @@
using Xunit.Abstractions;

using GCodeClean.Merge;
using GCodeClean.Shared;


namespace GCodeClean.Tests
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean.Tests/Processing.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2020-2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System;
using System.Collections.Generic;
Expand Down
4 changes: 2 additions & 2 deletions GCodeClean.Tests/Workflow.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2020-2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Copyright (c) 2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/IO/AsyncTextFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2020-22 - Lee HUMPHRIES (lee@md8n.com) and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System.Collections.Generic;
using System.IO;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/IO/TextFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2020-2023 - Lee HUMPHRIES (lee@md8n.com) and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System.Collections.Generic;
using System.IO;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Merge/Algorithm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Merge/Edges.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System.Collections.Generic;
using System.Linq;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Merge/MergeFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System;
using System.Linq;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Merge/NodeFileIO.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Merge/Nodes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System.Collections.Generic;
using System.Linq;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Merge/NodesAndEdges.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System.Collections.Generic;
using System.Linq;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Merge/Structure.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

namespace GCodeClean.Merge
{
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Merge/Utility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System;
using System.Collections.Generic;
Expand Down
4 changes: 2 additions & 2 deletions GCodeClean/Processing/Dedup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2020-2022 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Copyright (c) 2020-2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Processing/Default.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2020-2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System.Collections.Generic;

Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Processing/Linter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2020-2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System.Collections.Generic;
using System.Linq;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Processing/Processing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2020-2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Processing/Tokeniser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2020-2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Processing/Utility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2020-2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Processing/Workflow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2022-2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System.Collections.Generic;
using System.Linq;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Shared/Structure.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

// Structures shared by Split and Merge

Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Shared/Utility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Split/SplitFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Structure/Context.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2020-2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System.Collections.Generic;
using System.Linq;
Expand Down
4 changes: 2 additions & 2 deletions GCodeClean/Structure/Coord.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2020 - Lee HUMPHRIES (lee@md8n.com) and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Copyright (c) 2020-2023 - Lee HUMPHRIES (lee@md8n.com) and contributors. All rights reserved.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Structure/Letter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2023 - Lee HUMPHRIES (lee@md8n.com) and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

namespace GCodeClean.Structure
{
Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Structure/Line.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2020-2023 - Lee HUMPHRIES (lee@md8n.com). All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System;
using System.Collections.Generic;
Expand Down
4 changes: 2 additions & 2 deletions GCodeClean/Structure/ModalGroup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2020 - Lee HUMPHRIES (lee@md8n.com) and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Copyright (c) 2020-2023 - Lee HUMPHRIES (lee@md8n.com) and contributors. All rights reserved.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System.Collections.Immutable;

Expand Down
2 changes: 1 addition & 1 deletion GCodeClean/Structure/Token.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2020-2023 - Lee HUMPHRIES (lee@md8n.com) and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for details.
// Licensed under the AGPL license. See LICENSE.txt file in the project root for details.

using System;
using System.Linq;
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ G0 X39.29 Y-105.937

## License

This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details
This project is licensed under the AGPL License - see the [LICENSE](LICENSE) file for details

## Acknowledgments

Expand Down