Improve equation solving involving uncertainty propagation; Add the p…

…ot file to the repository; Fix po-defs/Makefile.am
Qalculate · Mar 11, 2019 · 8e9578e · 8e9578e
1 parent f88d414
commit 8e9578e
Show file tree

Hide file tree

Showing 5 changed files with 4,133 additions and 681 deletions.
diff --git a/libqalculate/MathStructure.cc b/libqalculate/MathStructure.cc
@@ -12445,15 +12445,51 @@ Variable *find_interval_replace_var_comp(MathStructure &m, const EvaluationOptio
 	return NULL;
 }
 
-void eval_comparison_sides(MathStructure &m, const EvaluationOptions &eo) {
+bool eval_comparison_sides(MathStructure &m, const EvaluationOptions &eo) {
 	if(m.isComparison()) {
-		m[0].eval(eo);
-		m[1].eval(eo);
-		return;
-	}
-	for(size_t i = 0; i < m.size(); i++) {
-		eval_comparison_sides(m[i], eo);
+		MathStructure mbak(m);
+		if(!m[0].isUnknown()) {
+			bool ret = true;
+			CALCULATOR->beginTemporaryStopMessages();
+			m[0].eval(eo);
+			if(m[0].containsFunction(CALCULATOR->f_uncertainty) && !mbak[0].containsFunction(CALCULATOR->f_uncertainty)) {
+				CALCULATOR->endTemporaryStopMessages();
+				m[0] = mbak[0];
+				ret = false;
+			} else {
+				CALCULATOR->endTemporaryStopMessages(true);
+			}
+			CALCULATOR->beginTemporaryStopMessages();
+			m[1].eval(eo);
+			if(m[1].containsFunction(CALCULATOR->f_uncertainty) && !mbak[1].containsFunction(CALCULATOR->f_uncertainty)) {
+				CALCULATOR->endTemporaryStopMessages();
+				m[1] = mbak[1];
+				ret = false;
+			} else {
+				CALCULATOR->endTemporaryStopMessages(true);
+			}
+			if(ret && !m.containsUnknowns()) {
+				m.calculatesub(eo, eo, false);
+				return true;
+			}
+			return false;
+		} else {
+			m[1].eval(eo);
+			m.calculatesub(eo, eo, false);
+			return true;
+		}
+	} else if(m.containsType(STRUCT_COMPARISON)) {
+		bool ret = true;
+		for(size_t i = 0; i < m.size(); i++) {
+			if(!eval_comparison_sides(m[i], eo)) ret = false;
+		}
+		m.childrenUpdated();
+		m.calculatesub(eo, eo, false);
+		return ret;
+	} else {
+		m.eval(eo);
 	}
+	return true;
 }
 
 bool separate_unit_vars(MathStructure &m, const EvaluationOptions &eo, bool only_approximate, bool dry_run) {
@@ -12584,7 +12620,19 @@ MathStructure &MathStructure::eval(const EvaluationOptions &eo) {
 					else replace(vars[i], ((UnknownVariable*) vars[i])->interval());
 					vars[i]->destroy();
 				}
-				eval_comparison_sides(*this, eo);
+				if(eval_comparison_sides(*this, feo)) {
+					CALCULATOR->endTemporaryStopMessages(true);
+					if(eo.structuring != STRUCTURING_NONE) simplify_ln(*this);
+					structure(eo.structuring, eo2, false);
+					if(eo.structuring != STRUCTURING_NONE) simplify_ln(*this);
+					clean_multiplications(*this);
+				} else {
+					CALCULATOR->error(false, _("Calculation of uncertainty propagation partially failed (using interval arithmetic instead when necessary)."), NULL);
+					EvaluationOptions eo4 = eo;
+					eo4.interval_calculation = INTERVAL_CALCULATION_INTERVAL_ARITHMETIC;
+					eval(eo4);
+				}
+				return *this;
 			} else {
 				CALCULATOR->beginTemporaryStopMessages();
 				munc = calculate_uncertainty(*this, eo, b_failed);
@@ -12711,7 +12759,7 @@ MathStructure &MathStructure::eval(const EvaluationOptions &eo) {
 				}
 				CALCULATOR->endTemporaryStopMessages(!b_failed);
 				if(b_failed) {
-					CALCULATOR->error(false, _("Calculation of uncertainty propagation failed (using interval arithmetic instead)"), NULL);
+					CALCULATOR->error(false, _("Calculation of uncertainty propagation failed (using interval arithmetic instead)."), NULL);
 					set(mbak);
 					EvaluationOptions eo3 = eo;
 					eo3.interval_calculation = INTERVAL_CALCULATION_INTERVAL_ARITHMETIC;
@@ -21856,6 +21904,21 @@ bool MathStructure::replace(const MathStructure &mfrom, const MathStructure &mto
 	}
 	return b;
 }
+bool MathStructure::replace(Variable *v, const MathStructure &mto) {
+	if(b_protected) b_protected = false;
+	if(m_type == STRUCT_VARIABLE && o_variable == v) {
+		set(mto);
+		return true;
+	}
+	bool b = false;
+	for(size_t i = 0; i < SIZE; i++) {
+		if(CHILD(i).replace(v, mto)) {
+			b = true;
+			CHILD_UPDATED(i);
+		}
+	}
+	return b;
+}
 bool MathStructure::calculateReplace(const MathStructure &mfrom, const MathStructure &mto, const EvaluationOptions &eo) {
 	if(equals(mfrom, true, true)) {
 		set(mto);

diff --git a/libqalculate/MathStructure.h b/libqalculate/MathStructure.h
@@ -824,6 +824,7 @@ class MathStructure {
 		size_t countFunctions(bool count_subfunctions = true) const;
 		void findAllUnknowns(MathStructure &unknowns_vector);
 		bool replace(const MathStructure &mfrom, const MathStructure &mto, bool once_only = false);
+		bool replace(Variable *v, const MathStructure &mto);
 		bool calculateReplace(const MathStructure &mfrom, const MathStructure &mto, const EvaluationOptions &eo);
 		bool replace(const MathStructure &mfrom1, const MathStructure &mto1, const MathStructure &mfrom2, const MathStructure &mto2);
 		bool removeType(StructureType mtype);

diff --git a/po-defs/Makefile.am b/po-defs/Makefile.am
@@ -3,4 +3,4 @@
 #
 
 EXTRA_DIST = \
-	POTFILES.in sv.po
+	POTFILES.in *.po