Replaced static properties in singleton classes by instance propertie…

…s to ensure complete data wipeout whenever DisposeInstance is called.
IvanRibakov · Jun 7, 2018 · 2afd810 · 2afd810
1 parent c59da20
commit 2afd810
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 21 deletions.
diff --git a/ExpertModule/Its.ExpertModule/ExpertControl.cs b/ExpertModule/Its.ExpertModule/ExpertControl.cs
@@ -22,7 +22,7 @@ public class ExpertControl
 		/// <summary>
 		/// The instance domain actions factory.
 		/// </summary>
-		private static DomainActionsFactory _instanceDomainActionsFactory;
+		private DomainActionsFactory _instanceDomainActionsFactory;
 		/// <summary>
 		/// The instance student control.
 		/// </summary>

diff --git a/Factories/Its.Factories/DomainActionsFactory.cs b/Factories/Its.Factories/DomainActionsFactory.cs
@@ -23,11 +23,11 @@ public class DomainActionsFactory
 		/// <summary>
 		/// The ontology.
 		/// </summary>
-		private static OntologyAccess ONTOLOGY;// = OntologyAccess.Instance;
+		private OntologyAccess ONTOLOGY;// = OntologyAccess.Instance;
 		/// <summary>
 		/// The action access.
 		/// </summary>
-		private static ActionAccess ACTION_ACCESS; //= ActionAccess.Instance;
+		private ActionAccess ACTION_ACCESS; //= ActionAccess.Instance;
 		/// <summary>
 		/// The DomainActionsFactory singleton instance.
 		/// </summary>
@@ -1247,5 +1247,11 @@ private TutorMessage createTutorMsgHelper(string msg)
 
 			return tutorMsg;
 		}
+
+		public static void DisposeInstance() {
+			if (_instance != null) {
+				_instance = null;
+			}
+		}
 	}
 }
diff --git a/Factories/Its.Factories/DomainLogFactory.cs b/Factories/Its.Factories/DomainLogFactory.cs
@@ -20,7 +20,7 @@ public class DomainLogFactory
 		/// <summary>
 		/// The ONTOLOG.
 		/// </summary>
-		private static OntologyAccess ONTOLOGY; //= OntologyAccess.Instance;
+		private OntologyAccess ONTOLOGY; //= OntologyAccess.Instance;
 		/// <summary>
 		/// LogFactory singleton instance.
 		/// </summary>
@@ -213,5 +213,11 @@ from error in otherErrors
 			//Returns the DomainLog.
 			return domainLog;
 		}
+
+		public static void DisposeInstance() {
+			if (_instance != null) {
+				_instance = null;
+			}
+		}
 	}
 }
diff --git a/Factories/Its.Factories/ErrorFactory.cs b/Factories/Its.Factories/ErrorFactory.cs
@@ -16,7 +16,7 @@ public class ErrorFactory
 		/// <summary>
 		/// The ontology.
 		/// </summary>
-		private static OntologyAccess ONTOLOGY; //= OntologyAccess.Instance;
+		private OntologyAccess ONTOLOGY; //= OntologyAccess.Instance;
 		/// <summary>
 		/// The instance.
 		/// </summary>

diff --git a/Factories/Its.Factories/StudentFactory.cs b/Factories/Its.Factories/StudentFactory.cs
@@ -15,7 +15,7 @@ public class StudentFactory
 		/// <summary>
 		/// The ontology.
 		/// </summary>
-		private static OntologyAccess ONTOLOGY;
+		private OntologyAccess ONTOLOGY;
 		/// <summary>
 		/// The instance.
 		/// </summary>
@@ -60,6 +60,12 @@ public Dictionary<string, Student> CreateStudents ()
 			//Returns the list.
 			return students;
 		}
+
+		public static void DisposeInstance() {
+			if (_instance != null) {
+				_instance = null;
+			}
+		}
 	}
 }
 
diff --git a/StudentModule/Its.StudentModule.DataAccess/OntologyAccess.cs b/StudentModule/Its.StudentModule.DataAccess/OntologyAccess.cs
@@ -72,57 +72,58 @@ public static OntologyAccess Instance (string ontologyPath, string logsPath){
 		/// <summary>
 		/// The ontology model in which it will be saved student information.
 		/// </summary>
-		private static OntModel _studentDataModel;
+		private OntModel _studentDataModel;
 		/// <summary>
 		/// The ontology model in which it will be worked with domain and action information.
 		/// </summary>
-		private static OntModel _domainDataModel;
+		private OntModel _domainDataModel;
 		/// <summary>
 		/// The other data model.
 		/// </summary>
-		private static OntModel _otherDataModel;
+		private OntModel _otherDataModel;
 		/// <summary>
 		/// The world data model.
 		/// </summary>
-		private static OntModel _worldDataModel;
+		private OntModel _worldDataModel;
 		/// <summary>
 		/// The general ontology model.
 		/// </summary>
-		private static OntModel _ontModel;
+		private OntModel _ontModel;
 		/// <summary>
 		/// The student ontology.
 		/// </summary>
-		private static Ontology _studentOnto;
+		private Ontology _studentOnto;
 		/// <summary>
 		/// The domain ontology.
 		/// </summary>
-		private static Ontology _domainOnto;
+		private Ontology _domainOnto;
 		/// <summary>
 		/// The other ontology.
 		/// </summary>
-		private static Ontology _otherOnto;
+		private Ontology _otherOnto;
 		/// <summary>
 		/// The world ontology.
 		/// </summary>
-		private static Ontology _worldOnto;
+		private Ontology _worldOnto;
 		/// <summary>
 		/// The ont models.
 		/// </summary>
-		private static Dictionary<string, OntModel> _logModels = new Dictionary<string, OntModel>();
+		private Dictionary<string, OntModel> _logModels;
 		/// <summary>
 		/// The ontology path.
 		/// </summary>
-		private static string _ontologyPath;
+		private string _ontologyPath;
 		/// <summary>
 		/// The logs path.
 		/// </summary>
-		private static string _logsPath;
+		private string _logsPath;
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="Its.Student.DataAccess.OntologyAccess"/> class.
 		/// </summary>
 		private OntologyAccess (string ontologyPath, string logsPath)
 		{
+			_logModels = new Dictionary<string, OntModel>();
 			//Creates an ontology model empty instance.
 			_studentDataModel = ModelFactory.createOntologyModel ();
 			//Creates an ontology model empty instance.
@@ -2274,5 +2275,11 @@ public void SaveStudentTraceOnto(string domainKey, string studentKey)
 				bw.close();
 			}
 		}
+
+		public static void DisposeInstance() {
+			if (_instance != null) {
+				_instance = null;
+			}
+		}
 	}
 }
diff --git a/StudentModule/Its.StudentModule/StudentControl.cs b/StudentModule/Its.StudentModule/StudentControl.cs
@@ -20,15 +20,15 @@ public class StudentControl
 		/// <summary>
 		/// The ontology.
 		/// </summary>
-		private static OntologyAccess ONTOLOGY; //= OntologyAccess.Instance;
+		private OntologyAccess ONTOLOGY; //= OntologyAccess.Instance;
 		/// <summary>
 		/// The instance.
 		/// </summary>
 		private static StudentControl _instance = null;
 		/// <summary>
 		/// The instance domain log factory.
 		/// </summary>
-		private static DomainLogFactory _instanceDomainLogFactory;
+		private DomainLogFactory _instanceDomainLogFactory;
 		/// <summary>
 		/// Gets the instance.
 		/// </summary>

diff --git a/TutoringModule/CollectiveModelTutor/Its.TutoringModule.CMTutorTest/Util.cs b/TutoringModule/CollectiveModelTutor/Its.TutoringModule.CMTutorTest/Util.cs
@@ -1,10 +1,13 @@
 using System;
+using System.CodeDom;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Its.ExpertModule;
 using Its.ExpertModule.ObjectModel;
+using Its.Factories;
 using Its.StudentModule;
+using Its.StudentModule.DataAccess;
 using Its.StudentModule.ObjectModel;
 using Its.TutoringModule.CMTutor.SBP;
 using Its.TutoringModule.CMTutor.SBP.OM;
@@ -43,6 +46,8 @@ public string ToString()
 
     public class Util
     {
+        public const double DOUBLE_PRECISION = 0.0001; 
+
         public static void GenerateLogs(ITutor tutor, string domainName, string objectName, List<Group> groupConfiguration)
         {
             Console.OutputEncoding = System.Text.Encoding.UTF8;
@@ -109,5 +114,19 @@ public static void InitModel(ITutorConfig config, string strDomainName, ClusterM
             DomainLog logs = StudentControl.Instance(ontologyPath, logsPath, expertConfPath).GetDomainLogsFromOntology(domain, expert.OtherErrors, world.WorldErrors);
             StudentBehaviorPredictorControl.Instance(config).AddModel(logs, cluMet, includeNoPlanActions, inPhases);
         }
+
+        public static void DestroyModel()
+        {
+            DomainLogFactory.DisposeInstance();   
+            DomainActionsFactory.DisposeInstance();
+            StudentFactory.DisposeInstance();
+
+            StudentBehaviorPredictorControl.DisposeInstance();
+
+            OntologyAccess.DisposeInstance();
+            ExpertControl.DisposeInstance();
+            WorldControl.DisposeInstance();
+            StudentControl.DisposeInstance();
+        }
     }
 }
diff --git a/WorldModule/Its.WorldModule/WorldControl.cs b/WorldModule/Its.WorldModule/WorldControl.cs
@@ -21,7 +21,7 @@ public class WorldControl
 		/// <summary>
 		/// The ONTOLOGY.
 		/// </summary>
-		private static OntologyAccess ONTOLOGY; //= OntologyAccess.Instance;
+		private OntologyAccess ONTOLOGY; //= OntologyAccess.Instance;
 		/// <summary>
 		/// The world objects.
 		/// </summary>