Skip to content

Commit 20a429e

RudyBricks RudyBricks

committed

Move files back to distributed source folders structure

1 parent 6c5e66f commit 20a429eCopy full SHA for 20a429e

File tree

18 files changed

+21

-18

lines changed

CMakeLists.txt
data_structure
- graph.h
- io
  - graph_io.cpp
  - graph_io.h
framework
- colouring
  - crossover
    - gpx.cpp
    - gpx.h
  - graph_colouring.cpp
  - graph_colouring.h
  - hca.cpp
  - hca.h
  - init
    - greedy_saturation.cpp
    - greedy_saturation.h
  - ls
    - tabu_search.cpp
    - tabu_search.h
- debug.h
- util
  - graph_util.cpp
  - graph_util.h
tests
- test_main.cpp

18 files changed

+21

-18

lines changed

`‎CMakeLists.txt`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,15 +16,18 @@ find_package(Boost COMPONENTS lockfeee)`
`16`	`16`	`#Common flags and variables`
`17`	`17`	`set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")`
`18`	`18`	`set(ROOT ${CMAKE_CURRENT_SOURCE_DIR})`
`19`		`-include_directories(${ROOT}/include)`
	`19`	`+include_directories(${ROOT})`
	`20`	`+include_directories(${ROOT}/framework)`
`20`	`21`
`21`	`22`	`#Source and include files`
`22`	`23`
`23`	`24`	`file(GLOB_RECURSE SRCS`
`24`		`- "src/*.cpp")`
	`25`	`+ "data_structure/*.cpp"`
	`26`	`+ "framework/*.cpp")`
`25`	`27`
`26`	`28`	`file(GLOB_RECURSE INCLUDES`
`27`		`- "include/*.h")`
	`29`	`+ "data_structure/*.h"`
	`30`	`+ "framework/*.h")`
`28`	`31`
`29`	`32`	`#Static library packaging`
`30`	`33`	`add_library(colouring ${SRCS} ${INCLUDES})`

`‎include/data_structure/graph.h renamed to ‎data_structure/graph.h`

File renamed without changes.

`‎src/data_structure/io/graph_io.cpp renamed to ‎data_structure/io/graph_io.cpp`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "data_structure/io/graph_io.h"`
	`1`	`+#include "graph_io.h"`
`2`	`2`
`3`	`3`	`int graph_io::readGraphWeighted(graph_access &G, const std::string &filename) {`
`4`	`4`	`std::string line;`

`‎include/data_structure/io/graph_io.h renamed to ‎data_structure/io/graph_io.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`#include <sstream>`
`32`	`32`	`#include <string>`
`33`	`33`
`34`		`-#include "data_structure/graph.h"`
	`34`	`+#include "../graph.h"`
`35`	`35`
`36`	`36`	`namespace graph_io {`
`37`	`37`	`int readGraphWeighted(graph_access &G, const std::string &filename);`

`‎src/colouring/crossover/gpx.cpp renamed to ‎framework/colouring/crossover/gpx.cpp`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "colouring/crossover/gpx.h"`
	`1`	`+#include "gpx.h"`
`2`	`2`
`3`	`3`	`#include <algorithm>`
`4`	`4`

`‎include/colouring/crossover/gpx.h renamed to ‎framework/colouring/crossover/gpx.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#pragma once`
`2`	`2`
`3`		`-#include "colouring/graph_colouring.h"`
	`3`	`+#include "../graph_colouring.h"`
`4`	`4`
`5`	`5`	`namespace graph_colouring {`
`6`	`6`	`/**`

`‎src/colouring/graph_colouring.cpp renamed to ‎framework/colouring/graph_colouring.cpp`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "colouring/graph_colouring.h"`
	`1`	`+#include "graph_colouring.h"`
`2`	`2`
`3`	`3`	`#include <atomic>`
`4`	`4`	`#include <algorithm>`

`‎include/colouring/graph_colouring.h renamed to ‎framework/colouring/graph_colouring.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#pragma once`
`2`	`2`
`3`		`-#include "data_structure/graph.h"`
	`3`	`+#include "../../data_structure/graph.h"`
`4`	`4`
`5`	`5`	`#include <functional>`
`6`	`6`	`#include <random>`

`‎src/colouring/hca.cpp renamed to ‎framework/colouring/hca.cpp`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-#include "colouring/hca.h"`
	`1`	`+#include "hca.h"`
`2`	`2`
`3`		`-#include "colouring/init/greedy_saturation.h"`
`4`		`-#include "colouring/crossover/gpx.h"`
`5`		`-#include "colouring/ls/tabu_search.h"`
	`3`	`+#include "init/greedy_saturation.h"`
	`4`	`+#include "crossover/gpx.h"`
	`5`	`+#include "ls/tabu_search.h"`
`6`	`6`
`7`	`7`	`namespace graph_colouring {`
`8`	`8`

`‎include/colouring/hca.h renamed to ‎framework/colouring/hca.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#pragma once`
`2`	`2`
`3`		`-#include "colouring/graph_colouring.h"`
	`3`	`+#include "graph_colouring.h"`
`4`	`4`
`5`	`5`	`namespace graph_colouring {`
`6`	`6`	`/**`

0 commit comments

Comments

(0)