Skip to content

Commit

Permalink
Fix constants with specified prefix; Remove debug output
Browse files Browse the repository at this point in the history
  • Loading branch information
@hanna-kn
hanna-kn committed Feb 11, 2019
1 parent f4f2f20 commit ae2204d
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 24 deletions.
48 changes: 26 additions & 22 deletions libqalculate/MathStructure.cc
View file
Expand Up @@ -4587,7 +4587,7 @@ int MathStructure::merge_multiplication(MathStructure &mstruct, const Evaluation
return 1;
}
}
if(mstruct.isZero() && (!eo.keep_zero_units || containsType(STRUCT_UNIT, false, true, true) == 0 || (CHILD(0).isUnit() && CHILD(0).unit() == CALCULATOR->u_rad) || (CHILD(0).isFunction() && CHILD(0).representsNumber(false))) && !representsUndefined(true, true, !eo.assume_denominators_nonzero) && representsNonMatrix()) {
if(mstruct.isZero() && (!eo.keep_zero_units || containsType(STRUCT_UNIT, false, true, true) <= 0 || (CHILD(0).isUnit() && CHILD(0).unit() == CALCULATOR->u_rad) || (CHILD(0).isFunction() && CHILD(0).representsNumber(false))) && !representsUndefined(true, true, !eo.assume_denominators_nonzero) && representsNonMatrix()) {
clear(true);
MERGE_APPROX_AND_PREC(mstruct)
return 1;
Expand Down Expand Up @@ -10091,6 +10091,7 @@ void clean_multiplications(MathStructure &mstruct) {

bool containsComplexUnits(const MathStructure &mstruct) {
if(mstruct.type() == STRUCT_UNIT && mstruct.unit()->hasComplexRelationTo(mstruct.unit()->baseUnit())) return true;
if(mstruct.isFunction() && mstruct.function() == CALCULATOR->f_stripunits) return false;
for(size_t i = 0; i < mstruct.size(); i++) {
if(containsComplexUnits(mstruct[i])) {
return true;
Expand All @@ -10103,6 +10104,7 @@ bool variablesContainsComplexUnits(const MathStructure &mstruct, const Evaluatio
if(mstruct.type() == STRUCT_VARIABLE && mstruct.variable()->isKnown() && (eo.approximation != APPROXIMATION_EXACT || !mstruct.variable()->isApproximate()) && ((KnownVariable*) mstruct.variable())->get().containsType(STRUCT_UNIT, false, true, true)) {
return containsComplexUnits(((KnownVariable*) mstruct.variable())->get());
}
if(mstruct.isFunction() && mstruct.function() == CALCULATOR->f_stripunits) return false;
for(size_t i = 0; i < mstruct.size(); i++) {
if(variablesContainsComplexUnits(mstruct[i], eo)) {
return true;
Expand Down Expand Up @@ -11962,7 +11964,6 @@ void solve_intervals(MathStructure &mstruct, const EvaluationOptions &eo, const
b = true;
MathStructure mvar;
fix_interval_variable(v, mvar);
mvar.unformat(eo);
mstruct.replace(v, mvar);
}
while(true) {
Expand All @@ -11971,10 +11972,10 @@ void solve_intervals(MathStructure &mstruct, const EvaluationOptions &eo, const
b = true;
MathStructure mvar;
fix_interval_variable(v, mvar);
mvar.unformat(eo);
mstruct.replace(v, mvar);
}
if(b) {
mstruct.unformat(eo);
EvaluationOptions eo2 = eo;
eo2.expand = false;
mstruct.calculatesub(eo2, feo, true);
Expand All @@ -11991,9 +11992,14 @@ void solve_intervals(MathStructure &mstruct, const EvaluationOptions &eo, const
}
}
if(mstruct.isComparison()) {
mstruct[0].subtract(mstruct[1]);
solve_intervals2(mstruct[0], vars, eo);
mstruct[1].clear(true);
if(feo.test_comparisons || feo.isolate_x) {
mstruct[0].subtract(mstruct[1]);
solve_intervals2(mstruct[0], vars, eo);
mstruct[1].clear(true);
} else {
solve_intervals2(mstruct[0], vars, eo);
solve_intervals2(mstruct[1], vars, eo);
}
return;
}
solve_intervals2(mstruct, vars, eo);
Expand Down Expand Up @@ -12104,7 +12110,6 @@ KnownVariable *find_interval_replace_var(MathStructure &m, MathStructure &unc, c
for(size_t i = 1; i < mvar.size(); i++) {
m.multiply(mvar[i], true);
}
m.unformat(eo);
*mnew = m;
v->destroy();
return v;
Expand Down Expand Up @@ -12132,9 +12137,7 @@ KnownVariable *find_interval_replace_var(MathStructure &m, MathStructure &unc, c
}
if(mmid && munc) {
unc = *munc;
unc.unformat(eo);
MathStructure mmid2(*mmid);
mmid2.unformat(eo);
KnownVariable *v = new KnownVariable("", string("(") + format_and_print(*mmid) + ")", mmid2);
v->ref();
m.set(v);
Expand All @@ -12144,10 +12147,8 @@ KnownVariable *find_interval_replace_var(MathStructure &m, MathStructure &unc, c
}
unc = mvar[1];
unc -= mvar[0];
unc.unformat(eo);
unc *= nr_half;
MathStructure mmid(mvar[0]);
mmid.unformat(eo);
mmid += mvar[1];
mmid *= nr_half;
KnownVariable *v = new KnownVariable("", string("(") + format_and_print(mmid) + ")", mmid);
Expand Down Expand Up @@ -12255,7 +12256,7 @@ bool replace_variables_with_interval(MathStructure &m, const EvaluationOptions &
}
m.set(mvar, true);
if(in_nounit) m.removeType(STRUCT_UNIT);
m.unformat(eo);
else m.unformat(eo);
return true;
}
bool b = false;
Expand Down Expand Up @@ -12298,6 +12299,7 @@ MathStructure calculate_uncertainty(MathStructure &m, const EvaluationOptions &e
vars.push_back(v);
uncs.push_back(unc);
}
m.unformat(eo);
if(eo.sync_units && eo.approximation != APPROXIMATION_EXACT) sync_approximate_units(m, eo, &vars, &uncs, true);
if(b_failed || vars.empty()) return m_zero;
MathStructure munc;
Expand Down Expand Up @@ -12356,7 +12358,7 @@ void eval_comparison_sides(MathStructure &m, const EvaluationOptions &eo) {
}
}

bool separate_unit_vars(MathStructure &m) {
bool separate_unit_vars(MathStructure &m, const EvaluationOptions &eo) {
if(m.isVariable() && m.variable()->isKnown()) {
const MathStructure &mvar = ((KnownVariable*) m.variable())->get();
if(mvar.isMultiplication()) {
Expand All @@ -12376,13 +12378,14 @@ bool separate_unit_vars(MathStructure &m) {
m.multiply(mvar[i], i);
}
}
m.unformat(eo);
return true;
}
}
if(m.isFunction() && m.function() == CALCULATOR->f_stripunits) return false;
bool b = false;
for(size_t i = 0; i < m.size(); i++) {
if(separate_unit_vars(m[i])) b = true;
if(separate_unit_vars(m[i], eo)) b = true;
}
return b;
}
Expand Down Expand Up @@ -12419,7 +12422,7 @@ MathStructure &MathStructure::eval(const EvaluationOptions &eo) {
vector<KnownVariable*> vars;
vector<MathStructure> uncs;
calculatesub(eo3, eo3);
while(eo.sync_units && (separate_unit_vars(*this) || sync_approximate_units(*this, feo, &vars, &uncs, false))) {
while(eo.sync_units && (separate_unit_vars(*this, feo) || sync_approximate_units(*this, feo, &vars, &uncs, false))) {
calculatesub(eo3, eo3);
}
eo3.approximation = APPROXIMATION_APPROXIMATE;
Expand All @@ -12443,9 +12446,8 @@ MathStructure &MathStructure::eval(const EvaluationOptions &eo) {
eo3.approximation = APPROXIMATION_EXACT;
vector<KnownVariable*> vars;
vector<MathStructure> uncs;
if(eo.sync_units) sync_approximate_units(*this, feo, &vars, &uncs, false);
calculatesub(eo3, eo3);
while(eo.sync_units && (separate_unit_vars(*this) || sync_approximate_units(*this, feo, &vars, &uncs, false))) {
while(eo.sync_units && (separate_unit_vars(*this, feo) || sync_approximate_units(*this, feo, &vars, &uncs, false))) {
calculatesub(eo3, eo3);
}
}
Expand Down Expand Up @@ -15265,7 +15267,7 @@ bool MathStructure::factorize(const EvaluationOptions &eo_pre, bool unfactorize,
eo.sync_units = false;
eo.structuring = STRUCTURING_NONE;
if(unfactorize) {
unformat();
unformat(eo_pre);
EvaluationOptions eo2 = eo;
eo2.expand = true;
eo2.combine_divisions = false;
Expand Down Expand Up @@ -21252,7 +21254,7 @@ bool MathStructure::convert(Unit *u, bool convert_complex_relations, bool *found
if(u->convert(u2, mstruct, exp)) {
if(feo.approximation == APPROXIMATION_EXACT && !isApproximate() && (mstruct.isApproximate() || exp.isApproximate())) return false;
if(b_p) {
unformat();
unformat(feo);
return convert(u, convert_complex_relations, found_complex_relations, calculate_new_functions, feo, new_prefix);
}
set(u);
Expand Down Expand Up @@ -21627,8 +21629,10 @@ int MathStructure::containsType(StructureType mtype, bool structural_only, bool
else if(retval < 0) ret = retval;
}
}
if(check_variables && m_type == STRUCT_VARIABLE && o_variable->isKnown()) {
return ((KnownVariable*) o_variable)->get().containsType(mtype, false, check_variables, check_functions);
if(check_variables && m_type == STRUCT_VARIABLE) {
if(o_variable->isKnown()) return ((KnownVariable*) o_variable)->get().containsType(mtype, false, check_variables, check_functions);
else if(!((UnknownVariable*) o_variable)->interval().isUndefined()) return ((UnknownVariable*) o_variable)->interval().containsType(mtype, false, check_variables, check_functions);
else if(mtype == STRUCT_UNIT) return -1;
} else if(check_functions && m_type == STRUCT_FUNCTION) {
if(function_value) {
return function_value->containsType(mtype, false, check_variables, check_functions);
Expand Down Expand Up @@ -25819,7 +25823,7 @@ int MathStructure::integrate(const MathStructure &x_var, const EvaluationOptions
EvaluationOptions eo_t = eo;
eo_t.approximation = APPROXIMATION_TRY_EXACT;
if(simplify_first) {
unformat();
unformat(eo_pre);
calculateFunctions(eo2);
calculatesub(eo2, eo2);
if(CALCULATOR->aborted()) CANNOT_INTEGRATE
Expand Down
2 changes: 0 additions & 2 deletions libqalculate/Number.cc
View file
Expand Up @@ -7592,8 +7592,6 @@ string Number::print(const PrintOptions &po, const InternalPrintStruct &ips) con
bool show_ending_zeroes = po.show_ending_zeroes;

string str_unc;

cout << str << endl;

if(b_pm_zero) {
if(!rerun && !po.preserve_precision && l10 > 0 && str.length() > 2) {
Expand Down

0 comments on commit ae2204d

Please sign in to comment.