Fixed MLT/MST calculation code

currentRelease/SystemScript/job_tool/__init__.py

@@ -3,7 +3,7 @@
 import operator
 import uilocale
 import os
-import collections
+from collections.abc import Sequence
 
 _=uilocale.InstallUiModule(ui.application.getapplicationpath()["systemscript"]+"job_tool"+os.sep,ui.application.getlocale())
 
@@ -99,7 +99,7 @@ class JobManager(object):
     """
     def appendjob(self,jobname,identifier):
         #if operator.isSequenceType(identifier):
-        if isinstance(identifier,collections.Sequence):
+        if isinstance(identifier,Sequence):
             self.joblst.append(job_types[jobname](identifier))
         else:
             self.joblst.append(job_types[jobname](jobname,identifier))
@@ -118,6 +118,16 @@ def AddRun(self,idel):
         self.AddOpenProjectIfChanges()
         self.appendjob("RUN",idel)
         self.appendjob("SAVE_PROJECT",idel)
+    def AddRun10(self,idel):
+        self.AddOpenProjectIfChanges()
+        for i in range(10):   
+            self.appendjob("RUN",idel)
+        self.appendjob("SAVE_PROJECT",idel)
+    def AddRun50(self,idel):
+        self.AddOpenProjectIfChanges()
+        for i in range(50):   
+            self.appendjob("RUN",idel)
+        self.appendjob("SAVE_PROJECT",idel)
     def ClearJobLst(self,idel):
         self.joblst=[]
         self.lastprojectpath=""
@@ -134,12 +144,16 @@ class manager:
     def __init__(self):
         self.jmanager=JobManager()
         self.addcalculation_id=ui.application.register_event(self.jmanager.AddRun)
+        self.addcalculation10_id=ui.application.register_event(self.jmanager.AddRun10)
+        self.addcalculation50_id=ui.application.register_event(self.jmanager.AddRun50)
         self.clear_jobs_id=ui.application.register_event(self.jmanager.ClearJobLst)
         self.execute_jobs_id=ui.application.register_event(self.jmanager.ExecJobs)
         self.print_jobs_id=ui.application.register_event(self.jmanager.PrintJobLst)
     def getmenu(self,typeel,idel,menu):
         submenu=[]
         submenu.append((_(u"Add calculation in the job list"),self.addcalculation_id))
+        submenu.append((_(u"Add 10 calculations to the job list"),self.addcalculation10_id))
+        submenu.append((_(u"Add 50 calculations to the job list"),self.addcalculation50_id))
         submenu.append(())
         submenu.append((_(u"Clear job list"),[(_(u"Confirmation"),self.clear_jobs_id)]))
         submenu.append((_(u"Run job list"),self.execute_jobs_id))

src/isimpa/data_manager/projet.cpp

@@ -694,6 +694,15 @@ void ProjectManager::RunCoreCalculation(Element* coreCalculation)
 		return;
 	}
 
+	if (coreCalculation->GetElementInfos().typeElement == Element::ELEMENT_TYPE_CORE_SPPSAGH) 
+	{
+		E_Core_Core_Configuration* confCore = dynamic_cast<E_Core_Core_Configuration*>(coreCalculation->GetElementByType(Element::ELEMENT_TYPE_CORE_CORE_CONFIG));
+		int calcCode = confCore->GetListConfig("calculation_core");
+		if (calcCode == 2) {
+			wxLogWarning(_("You are using very experimantal MLT calculation code. Many things are not working!\n - only omnidirectional source supported\n - only point receivers supported"));
+		}
+	}
+
 	if (coreCalculation->GetElementInfos().typeElement != Element::ELEMENT_TYPE_CORE_SPPSAGH)
 	{
 		std::vector<Element*> lstMatRow, egroupeSurf;
@@ -720,7 +729,6 @@ void ProjectManager::RunCoreCalculation(Element* coreCalculation)
 				}
 			}
 		}
-
 	}
 
 	//On active l'onglet des messages
@@ -1046,8 +1054,8 @@ void ProjectManager::ImportMaterialCatt(wxString fromFile)
 	//Attention utilisations d'expressions régulières ( mal de tête en perspective ), mot clé: regex
 
 	//Fonctionne quelque soit le nombre de bande de frequence
-	wxRegEx generalMatHeader(wxT("(.*) = <((( ?[+-]?([0-9]*[.])?[0-9]+) ?)*)>( L )?(<((( ?[+-]?([0-9]*[.])?[0-9]+) ?)*)>)?( {([0-9]+) ([0-9]+) ([0-9]+)})?"));
-
+	//wxRegEx generalMatHeader(wxT("(.*) = <((( ?[+-]?([0-9]*[.])?[0-9]+) ?)*)>( L )?(<((( ?[+-]?([0-9]*[.])?[0-9]+) ?)*)>)?( {([0-9]+) ([0-9]+) ([0-9]+)})?"));
+	wxRegEx generalMatHeader(wxT("(?:ABS|abs|Abs) (.*?)[[:space:]]*=?[[:space:]]*<((( ?[+-]?([0-9]*[.])?[0-9]+) ?)*)>[[:space:]]*(L1?)?[[:space:]]*(<(((.?[+-]?([0-9]*[.])?[0-9]+) ?)*)>)?[[:space:]]*({.?([0-9]+) ([0-9]+) ([0-9]+)})?"));
 	wxRegEx matInfos(wxT("(.*):(.*)"));
 
 	wxString ligne=lecteur.GetLine();
@@ -1073,7 +1081,7 @@ void ProjectManager::ImportMaterialCatt(wxString fromFile)
 				}
 				wxString absName= generalMatHeader.GetMatch(ligne,1);
 				wxString chaineAbsorption=generalMatHeader.GetMatch(ligne,2);
-				wxString chaineDiffusion=generalMatHeader.GetMatch(ligne,6);
+				wxString chaineDiffusion=generalMatHeader.GetMatch(ligne,8);
 				wxString red = generalMatHeader.GetMatch(ligne, 13);
 				wxString green = generalMatHeader.GetMatch(ligne, 14);
 				wxString blue = generalMatHeader.GetMatch(ligne, 15);

src/isimpa/data_manager/tree_core/e_core_spps_aghcore_advanced.h

@@ -223,6 +223,9 @@ class E_Core_SppsNee_AGH_advanced_MLT : public Element
 		if (!this->IsPropertyExist("mutationNumber")) {
 			InitBaseMLTProperties(this);
 		}
+		if (!this->IsPropertyExist("useRejectionSampling")) {
+			InitAdditionalMLTProperties(this);
+		}
 	}
 
 	E_Core_SppsNee_AGH_advanced_MLT(Element* parent)
@@ -248,6 +251,31 @@ class E_Core_SppsNee_AGH_advanced_MLT : public Element
 
 	void Modified(Element* eModif)
 	{
+		t_elementInfo filsInfo = eModif->GetElementInfos();
+		if (filsInfo.libelleElement == "selectSeeds") {
+			this->SetReadOnlyConfig("seedSampleRatio", !this->GetBoolConfig("selectSeeds"));
+			this->SetReadOnlyConfig("seedSelectionExponent", !this->GetBoolConfig("selectSeeds"));
+		}
+		else if (filsInfo.libelleElement == "mutationNumber") {
+			this->SetReadOnlyConfig("largeStepProb", !(bool)this->GetIntegerConfig("mutationNumber"));
+			this->SetReadOnlyConfig("selectSeeds", !(bool)this->GetIntegerConfig("mutationNumber"));
+			this->SetReadOnlyConfig("seedSampleRatio", !(bool)this->GetIntegerConfig("mutationNumber"));
+			this->SetReadOnlyConfig("seedSelectionExponent", !(bool)this->GetIntegerConfig("mutationNumber"));
+			this->SetReadOnlyConfig("useWeightDecayCompensation", !(bool)this->GetIntegerConfig("mutationNumber"));
+			this->SetReadOnlyConfig("mutateSource", !(bool)this->GetIntegerConfig("mutationNumber"));
+			this->SetReadOnlyConfig("reflectionPenalty", !(bool)this->GetIntegerConfig("mutationNumber"));
+			this->SetReadOnlyConfig("costMatAbsorption", !(bool)this->GetIntegerConfig("mutationNumber"));
+			this->SetReadOnlyConfig("costMatDiffusion", !(bool)this->GetIntegerConfig("mutationNumber"));
+			this->SetReadOnlyConfig("costShadowRays", !(bool)this->GetIntegerConfig("mutationNumber"));
+			this->SetReadOnlyConfig("costReflDir", !(bool)this->GetIntegerConfig("mutationNumber"));
+			this->SetReadOnlyConfig("costAirAb", !(bool)this->GetIntegerConfig("mutationNumber"));
+			this->SetReadOnlyConfig("useRejectionSampling", !(bool)this->GetIntegerConfig("mutationNumber"));
+			this->SetReadOnlyConfig("lowMemoryMode", !(bool)this->GetIntegerConfig("mutationNumber"));
+
+			if (this->GetIntegerConfig("mutationNumber") == 0) this->UpdateBoolConfig("useRejectionSampling", true);
+			if (this->GetIntegerConfig("mutationNumber") == 0) this->UpdateBoolConfig("lowMemoryMode", true);
+		}
+
 		Element::Modified(eModif);
 	}
 
@@ -258,16 +286,38 @@ class E_Core_SppsNee_AGH_advanced_MLT : public Element
 	{
 		InitRandomSeed(this);
 		InitBaseMLTProperties(this);
+		InitAdditionalMLTProperties(this);
 	}
 
 	void InitRandomSeed(Element* confCore) {
 		confCore->AppendPropertyInteger("random_seed", wxTRANSLATE("Random seed"), 0, true, false, true);
 	}
 
 	void InitBaseMLTProperties(Element* confCore) {
-		confCore->AppendPropertyDecimal("largeStepProb", wxTRANSLATE("Large step probability"), 0.5, false, 2, true, true, 1, 0, true);
-		confCore->AppendPropertyDecimal("specularReflProbabilityMulti", wxTRANSLATE("Specular reflection probability multiplier"), 0.5, false, 3, true, true, 10, 0.01, true);
-		confCore->AppendPropertyInteger("mutationNumber", wxTRANSLATE("Mutation number"), 25, true, false, true, 0, 0);
+		confCore->AppendPropertyDecimal("largeStepProb", wxTRANSLATE("Tune - Large step probability"), 0.2, false, 2, true, true, 1, 0, true);
+		//confCore->AppendPropertyDecimal("specularReflProbabilityMulti", wxTRANSLATE("Tune - Specular reflection probability multiplier"), 0.5, false, 3, true, true, 10, 0.01, true);
+		confCore->AppendPropertyInteger("mutationNumber", wxTRANSLATE("Sampling - Mutation number"), 10, true, false, true, 0, 0);
+	}
+	void InitAdditionalMLTProperties(Element* confCore) {
+		confCore->AppendPropertyBool("useRejectionSampling", wxTRANSLATE("Use - Rejection sampling"), true, true);
+		confCore->AppendPropertyBool("useWeightDecayCompensation", wxTRANSLATE("Use - Weight decay compensation"), true, true);
+		confCore->AppendPropertyBool("mutateSource", wxTRANSLATE("Use - Mutate source"), true, true);
+		confCore->AppendPropertyBool("selectSeeds", wxTRANSLATE("Use - Seed selection"), true, true);
+
+		confCore->AppendPropertyDecimal("seedSampleRatio", wxTRANSLATE("Sampling - Seed to sample ratio"), 0.1, false, 2, true, true, 1, 0.01, true);
+		confCore->AppendPropertyDecimal("mutatedWeight", wxTRANSLATE("Sampling - Mutated particles weight"), 1, false, 1, true, true, 20, 0.5, true);
+		confCore->AppendPropertyDecimal("reflectionPenalty", wxTRANSLATE("Tune - Relfection penalty multiplier"), 0.8, false, 2, true, true, 10, 0.01, true);
+		confCore->AppendPropertyInteger("mutationGeneratorS1", wxTRANSLATE("Tune - Mutation generator S1"), 1024, true, false, true, 0, 1);
+		confCore->AppendPropertyInteger("mutationGeneratorS2", wxTRANSLATE("Tune - Mutation generator S2"), 64, true, false, true, 0, 1);
+		confCore->AppendPropertyDecimal("mutationProbability", wxTRANSLATE("Tune - Mutation probability"), 1, false, 3, true, true, 1, 0.1, true);
+		confCore->AppendPropertyDecimal("seedSelectionExponent", wxTRANSLATE("Tune - Seed selection exponent"), 0.5, false, 2, true, true, 1, 0.01, true);
+		confCore->AppendPropertyBool("lowMemoryMode", wxTRANSLATE("Tune - Low memory mode"), true, true);
+
+		confCore->AppendPropertyBool("costMatAbsorption", wxTRANSLATE("Cost - use material absorption"), true, true);
+		confCore->AppendPropertyBool("costMatDiffusion", wxTRANSLATE("Cost - use material diffusion"), false, true);
+		confCore->AppendPropertyBool("costShadowRays", wxTRANSLATE("Cost - use shadow rays"), true, true);
+		confCore->AppendPropertyBool("costReflDir", wxTRANSLATE("Cost - use reflection direction"), false, true);
+		confCore->AppendPropertyBool("costAirAbs", wxTRANSLATE("Cost - use air absorption"), false, true);
 	}
 };
 

src/lib_interface/Core/mathlib.h

@@ -179,7 +179,10 @@ class base_vec3 {
 	// this < _v
 	bool compare(const base_vec3 &_v,base_t epsi=EPSILON) { return (fabs(this->x - _v.x) < epsi && fabs(this->y - _v.y) < epsi && fabs(this->z - _v.z) < epsi); }
 	base_t angle(const base_vec3 &v)  const { // retourne l'angle en radians entre *this et v
-		base_t angle = acos(this->dot(v)/(this->length()*v.length()));
+		base_t dot_prod = this->dot(v) / (this->length() * v.length());
+		if (dot_prod > 1) dot_prod = 1;
+		if (dot_prod < -1) dot_prod = -1;
+		base_t angle = acos(dot_prod);
 		if(angle < EPSILON) return 0;
 		return angle;
 	}

src/lib_interface/input_output/progressionInfo.h

@@ -73,6 +73,12 @@ class progressOperation
 	{
 		PushProgression(1.f);
 	}
+
+	void Push(float increment)
+	{
+		PushProgression(increment);
+	}
+
 protected:
 	//friend class progressOperation;
 

src/spps-agh/CalculationCoreAGH.cpp

@@ -201,6 +201,7 @@ bool CalculationCoreSPPS::VisabilityTest(const CONF_PARTICULE_AGH &configuration
 	CONF_PARTICULE_AGH testParticle = configurationP;
 
 	testParticle.nextModelIntersection.idface = GetTetraFaceCollision(testParticle, testParticle.direction, t);
+	if (testParticle.nextModelIntersection.idface == -1) return false;
 	testParticle.nextModelIntersection.collisionPosition = testParticle.position + testParticle.direction*t;
 	obst_dist = configurationP.direction.length()*t;
 
@@ -225,6 +226,7 @@ bool CalculationCoreSPPS::VisabilityTest(const CONF_PARTICULE_AGH &configuration
 		{
 			testParticle.currentTetra = nextTetra;
 			testParticle.nextModelIntersection.idface = GetTetraFaceCollision(testParticle, testParticle.direction, t);
+			if (testParticle.nextModelIntersection.idface == -1) return false;
 			testParticle.nextModelIntersection.collisionPosition = testParticle.position + testParticle.direction*t;
 			obst_dist += testParticle.direction.length()*t;