From 595d012788ff266beb2eaa8212c9c75a35380046 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 5 Feb 2025 13:18:34 +0300 Subject: [PATCH] code amendement --- instat/clsRLink.vb | 3 ++- instat/frmMain.vb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb index a3a83a370e..7b53ed13e8 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -221,7 +221,7 @@ Public Class RLink Dim clsUnloadRPackages As New RFunction clsUnloadRPackages.SetRCommand("unload_R_Instat_packages") - RunScript(clsUnloadRPackages.ToScript, strComment:="Saving data") + 'RunScript(clsUnloadRPackages.ToScript, strComment:="Saving data") clsEngine.Evaluate("rm(list = ls(all.names = TRUE))") ' Remove hidden objects as well clsEngine.Evaluate("gc()") ' Trigger garbage collection @@ -233,6 +233,7 @@ Public Class RLink ' Reset initialization flag bREngineInitialised = False + clsEngine.ClearGlobalEnvironment() ' Attempt to start a new R engine instance If StartREngine() Then diff --git a/instat/frmMain.vb b/instat/frmMain.vb index aa02ef60c8..15ba754f7a 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2944,7 +2944,7 @@ Public Class frmMain Private Sub mnuToolsRestartR_Click(sender As Object, e As EventArgs) Handles mnuToolsRestartR.Click Dim memUsageAfterBytes As Long = clsRLink.clsEngine.Evaluate("pryr::mem_used()").AsNumeric(0) Dim memUsageAfterMB As Double = memUsageAfterBytes / (1024 * 1024) - Logger.Info("Memory Usage After Restart1: " & memUsageAfterMB.ToString("F2") & " MB") + Logger.Info("Memory Usage Before Restart: " & memUsageAfterMB.ToString("F2") & " MB") If clsRLink.RestartREngine Then Dim memUsageAfterBytes2 As Long = clsRLink.clsEngine.Evaluate("pryr::mem_used()").AsNumeric(0) @@ -2967,7 +2967,7 @@ Public Class frmMain Dim memUsageAfterBytes1 As Long = clsRLink.clsEngine.Evaluate("pryr::mem_used()").AsNumeric(0) Dim memUsageAfterMB1 As Double = memUsageAfterBytes1 / (1024 * 1024) - Logger.Info("Memory Usage After Restart: " & memUsageAfterMB1.ToString("F2") & " MB") + Logger.Info("Memory Usage After Restart and resetting working folder: " & memUsageAfterMB1.ToString("F2") & " MB") Else MsgBox("Failed to restart the R engine. Please check the configuration or reinstall R-Instat.", MsgBoxStyle.Critical, "Restart Failed")