A few tweaks in tests

tests/test_cln.cpp

@@ -24,7 +24,7 @@ double time () {
 
 template <typename T> void test (string s, int n) {
 	double t = time(); T z = 0;
-	for (int i=0; i<n; ++i) z = cos(z);
+	for (int i=0; i<n; ++i) z = exp(-z);
 	ostringstream os; os << time()-t;
 	cout << s << " | time = " << os.str() << "\t | result = " << z << endl;
 }

tests/test_permutation.cpp

@@ -4,34 +4,21 @@
 using namespace vb;
 using namespace std;
 
-vector<Permutation> permutations (int n, bool p (Permutation &) = [](Permutation&){return true;}) {
-	Permutation s(n); vector<Permutation> output;
-	do { if (p(s)) output.push_back(s); } while (next_permutation(s.begin(),s.end()));
-	return output;
-}
-
-vector<int> signature (Permutation & s) {
-	vector<int> output;
-	for (auto c : s.cycles()) output.push_back(c.size());
-	sort (output.begin(),output.end());
-	return output;
-}
-
-vector<Hypermap> maps (vector<int> s, vector<int> a, vector<int> p) {
+vector<Hypermap> maps (vector<unsigned> s, vector<unsigned> a, vector<unsigned> p) {
 	Cycles cs; int i=0;
 	for (int l : s) { vector<unsigned> c; for (int j=0; j<l; ++j) c.push_back(i++); cs.push_back (c); }
 	Permutation sigma (cs), alpha (sigma.size());
 	vector<Hypermap> output;
 	do {
-		if (signature(alpha) != a) continue;
-		Permutation phi = (sigma*alpha).inverse(); if (signature(phi) != p) continue;
+		if (alpha.signature() != a) continue;
+		Permutation phi = (sigma*alpha).inverse(); if (phi.signature() != p) continue;
 		output.push_back (Hypermap(sigma,alpha,phi)); cerr<<".";
 	} while (next_permutation(alpha.begin(),alpha.end()));
 	return output;
 }
 
 int main (int, char **) {
-	auto ms = maps (vector<int> {2,2,3}, vector<int> {2,2,3}, vector<int> {2,2,3});
+	auto ms = maps ({2,2,3}, {2,2,3}, {2,2,3});
 	for (auto m : ms) {
 		cout << m;
 		cout << "  sigma:     " << m.sigma;