From 6784b2153d34c5c37092bd8d3fa6c12c6e4337f3 Mon Sep 17 00:00:00 2001
From: Alinson S Xavier <axavier@anl.gov>
Date: Mon, 24 May 2021 15:33:32 -0500
Subject: [PATCH] Reorganize files

---
 src/MIPLearn.jl                               |  8 ++---
 src/instance/file.jl                          | 31 +++++++++++++++++++
 .../jump_instance.jl => instance/jump.jl}     | 29 -----------------
 .../jump_solver.jl => solvers/jump.jl}        |  0
 .../learning.jl}                              |  0
 src/{modeling => solvers}/macros.jl           |  0
 test/runtests.jl                              |  4 +--
 .../jump_solver_test.jl => solvers/jump.jl}   |  0
 .../learning.jl}                              |  0
 9 files changed, 37 insertions(+), 35 deletions(-)
 create mode 100644 src/instance/file.jl
 rename src/{modeling/jump_instance.jl => instance/jump.jl} (90%)
 rename src/{modeling/jump_solver.jl => solvers/jump.jl} (100%)
 rename src/{modeling/learning_solver.jl => solvers/learning.jl} (100%)
 rename src/{modeling => solvers}/macros.jl (100%)
 rename test/{modeling/jump_solver_test.jl => solvers/jump.jl} (100%)
 rename test/{modeling/learning_solver_test.jl => solvers/learning.jl} (100%)

diff --git a/src/MIPLearn.jl b/src/MIPLearn.jl
index b2f9bb0..8133d40 100644
--- a/src/MIPLearn.jl
+++ b/src/MIPLearn.jl
@@ -16,9 +16,9 @@ miplearn = pyimport("miplearn")
 
 include("utils/log.jl")
 include("utils/exceptions.jl")
-include("modeling/jump_instance.jl")
-include("modeling/jump_solver.jl")
-include("modeling/learning_solver.jl")
-include("modeling/macros.jl")
+include("instance/jump.jl")
+include("solvers/jump.jl")
+include("solvers/learning.jl")
+include("solvers/macros.jl")
 
 end # module
diff --git a/src/instance/file.jl b/src/instance/file.jl
new file mode 100644
index 0000000..a016405
--- /dev/null
+++ b/src/instance/file.jl
@@ -0,0 +1,31 @@
+#  MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization
+#  Copyright (C) 2020-2021, UChicago Argonne, LLC. All rights reserved.
+#  Released under the modified BSD license. See COPYING.md for more details.
+
+struct FileInstance
+    filename::AbstractString
+    loaded::Union{Nothing,JuMPInstance}
+end
+
+
+function FileInstance(filename::AbstractString)::FileInstance
+    return FileInstance(
+        filename,
+        nothing,
+    )
+end
+
+
+function load!(instance::FileInstance)
+    instance.loaded = load_jump_instance(instance.filename)
+end
+
+
+function free!(instance::FileInstance)
+    instance.loaded = nothing
+end
+
+
+function flush!(instance::FileInstance)
+    save(instance.filename, instance.loaded)
+end
diff --git a/src/modeling/jump_instance.jl b/src/instance/jump.jl
similarity index 90%
rename from src/modeling/jump_instance.jl
rename to src/instance/jump.jl
index 55c173d..6a08d2f 100644
--- a/src/modeling/jump_instance.jl
+++ b/src/instance/jump.jl
@@ -140,33 +140,4 @@ function load_jump_instance(filename::AbstractString)::JuMPInstance
 end
 
 
-struct FileInstance
-    filename::AbstractString
-    loaded::Union{Nothing,JuMPInstance}
-end
-
-
-function FileInstance(filename::AbstractString)::FileInstance
-    return FileInstance(
-        filename,
-        nothing,
-    )
-end
-
-
-function load!(instance::FileInstance)
-    instance.loaded = load_jump_instance(instance.filename)
-end
-
-
-function free!(instance::FileInstance)
-    instance.loaded = nothing
-end
-
-
-function flush!(instance::FileInstance)
-    save(instance.filename, instance.loaded)
-end
-
-
 export JuMPInstance, save, load_jump_instance
diff --git a/src/modeling/jump_solver.jl b/src/solvers/jump.jl
similarity index 100%
rename from src/modeling/jump_solver.jl
rename to src/solvers/jump.jl
diff --git a/src/modeling/learning_solver.jl b/src/solvers/learning.jl
similarity index 100%
rename from src/modeling/learning_solver.jl
rename to src/solvers/learning.jl
diff --git a/src/modeling/macros.jl b/src/solvers/macros.jl
similarity index 100%
rename from src/modeling/macros.jl
rename to src/solvers/macros.jl
diff --git a/test/runtests.jl b/test/runtests.jl
index 9ffdb27..a605ee5 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -8,6 +8,6 @@ using MIPLearn
 MIPLearn.setup_logger()
 
 @testset "MIPLearn" begin
-    include("modeling/jump_solver_test.jl")
-    include("modeling/learning_solver_test.jl")
+    include("solvers/jump.jl")
+    include("solvers/learning.jl")
 end
diff --git a/test/modeling/jump_solver_test.jl b/test/solvers/jump.jl
similarity index 100%
rename from test/modeling/jump_solver_test.jl
rename to test/solvers/jump.jl
diff --git a/test/modeling/learning_solver_test.jl b/test/solvers/learning.jl
similarity index 100%
rename from test/modeling/learning_solver_test.jl
rename to test/solvers/learning.jl