X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fexam_factor.cpp;h=9696a2b531daf372094e5c8e8ab4bda60894d683;hp=9d03ac4f27794e5b3a8e37bc44906c596f3dfa82;hb=edfa67d26bac695b5ef9911f3cda3ff50232e35a;hpb=1602530f716ba1d425a0667b897182b99c374823

diff --git a/check/exam_factor.cpp b/check/exam_factor.cpp
index 9d03ac4f..9696a2b5 100644
--- a/check/exam_factor.cpp
+++ b/check/exam_factor.cpp
@@ -3,7 +3,7 @@
  *  Factorization test suite. */
 
 /*
- *  GiNaC Copyright (C) 1999-2009 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2011 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -184,6 +184,33 @@ static unsigned exam_factor3()
 	return result;
 }
 
+static unsigned check_factorization(const exvector& factors)
+{
+	ex e = (new mul(factors))->setflag(status_flags::dynallocated);
+	ex ef = factor(e.expand());
+	if (ef.nops() != factors.size()) {
+		clog << "wrong number of factors, expected " << factors.size() <<
+			", got " << ef.nops();
+		return 1;
+	}
+	for (size_t i = 0; i < ef.nops(); ++i) {
+		if (find(factors.begin(), factors.end(), ef.op(i)) == factors.end()) {
+			clog << "wrong factorization: term not found: " << ef.op(i);
+			return 1;
+		}
+	}
+	return 0;
+}
+
+static unsigned factor_integer_content_bug()
+{
+	parser reader;
+	exvector factors;
+	factors.push_back(reader("x+y+x*y"));
+	factors.push_back(reader("3*x+2*y"));
+	return check_factorization(factors);
+}
+
 unsigned exam_factor()
 {
 	unsigned result = 0;
@@ -193,6 +220,8 @@ unsigned exam_factor()
 	result += exam_factor1(); cout << '.' << flush;
 	result += exam_factor2(); cout << '.' << flush;
 	result += exam_factor3(); cout << '.' << flush;
+	result += factor_integer_content_bug();
+	cout << '.' << flush;
 
 	return result;
 }