diff --git a/dopt.TOM/Plugin.cs b/dopt.TOM/Plugin.cs
index 244a63a..4d742f7 100644
--- a/dopt.TOM/Plugin.cs
+++ b/dopt.TOM/Plugin.cs
@@ -15,39 +15,22 @@ namespace dopt.TOM
protected dynamic tomWrapperPipelines;
public Plugin(string runtimePath) : base(SharpPython.PyOptimLevels.O, threaded: false, runtimePath: runtimePath, verbose: true)
{
- Environment.SetEnvironmentVariable("LANG_MAIN_BASE_FOLDERNAME", langMainBaseFolderName, EnvironmentVariableTarget.Process);
- Environment.SetEnvironmentVariable("LANG_MAIN_STOP_SEARCH_FOLDERNAME", langMainStopSearchFolderName, EnvironmentVariableTarget.Process);
- Environment.SetEnvironmentVariable("DOPT_TOM_PLUGIN_LIBRARY_USAGE", doptTOMPluginLibraryUsage, EnvironmentVariableTarget.Process);
base.Initialise();
using (Py.GIL())
{
+ dynamic os = Py.Import("os");
+ os.putenv("LANG_MAIN_BASE_FOLDERNAME", langMainBaseFolderName);
+ os.putenv("LANG_MAIN_STOP_SEARCH_FOLDERNAME", langMainStopSearchFolderName);
+ os.putenv("DOPT_TOM_PLUGIN_LIBRARY_USAGE", doptTOMPluginLibraryUsage);
tomWrapperPipelines = Py.Import("tom_plugin.pipeline");
}
}
- //private void Run() // for testing purposes
- //{
- // if (!_initialised) Initialise();
-
- // using (Py.GIL())
- // {
- // dynamic np = Py.Import("numpy");
- // Console.WriteLine(np.cos(np.pi * 2));
- // dynamic rand = Py.Import("random");
- // Console.WriteLine(rand.randint(1, 2));
- // dynamic pathlib = Py.Import("pathlib");
- // dynamic ret = pathlib.Path.cwd();
- // Console.WriteLine(ret);
- // }
-
- // Finalise();
- //}
public void RunOnCSV(string identifier, string filename)
{
AssertNotDisposed();
using (Py.GIL())
{
- dynamic tomWrapperPipeline = Py.Import("tom_plugin.pipeline");
- tomWrapperPipeline.run_on_csv_data(identifier, filename);
+ tomWrapperPipelines.run_on_csv_data(identifier, filename);
}
}
}
diff --git a/dopt.TOM/dopt.TOM.csproj b/dopt.TOM/dopt.TOM.csproj
index ac1767d..032b78b 100644
--- a/dopt.TOM/dopt.TOM.csproj
+++ b/dopt.TOM/dopt.TOM.csproj
@@ -3,12 +3,12 @@
netstandard2.0
x64
- 0.1.1-beta1
+ 0.1.2
x64
-
+