Core: refactoring spirit to self-contained library

Moved julia bindings into core/julia/Spirit.
DTolm · Feb 10, 2017 · c1bc4bf · c1bc4bf
1 parent eac1967
commit c1bc4bf
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/core/julia/Spirit/simulation.jl b/core/julia/Spirit/simulation.jl
@@ -0,0 +1,3 @@
+function Simulation_PlayPause(p_state, method_type, optimizer_type, n_iterations=-1, n_iterations_log=-1, idx_image=-1, idx_chain=-1)
+  ccall((:Simulation_PlayPause, spiritlib),  Void, (Ptr{Void}, Cstring, Cstring, Cint, Cint, Cint, Cint), p_state, method_type, optimizer_type, n_iterations, n_iterations_log, idx_image, idx_chain)
+end
diff --git a/ui-julia/core/core.jl → core/julia/Spirit/spirit.jl b/ui-julia/core/core.jl → core/julia/Spirit/spirit.jl
@@ -1,10 +1,10 @@
-module core
+module spirit
 
   export State_Setup
   export Simulation_PlayPause
 
   # TODO: do this as a relative path
-  const corelib = "C:/Users/Gideon/Git/monospin/ui-julia/core/core.dll"
+  const spiritlib = "C:/Users/Gideon/Git/spirit/core/julia/Spirit/spirit.dll"
 
   include("state.jl")
   include("simulation.jl")

diff --git a/core/julia/Spirit/state.jl b/core/julia/Spirit/state.jl
@@ -0,0 +1,3 @@
+function State_Setup(config_file="")
+  return ccall((:State_Setup, spiritlib),  Ptr{Void}, (Cstring,), config_file)
+end
diff --git a/ui-julia/core/simulation.jl b/ui-julia/core/simulation.jl
diff --git a/ui-julia/core/state.jl b/ui-julia/core/state.jl