From 74835e5264263e067437dd511b57eab27357736c Mon Sep 17 00:00:00 2001
From: Jiri Pittner <jiri@pittnerovi.com>
Date: Wed, 9 Jun 2021 11:22:04 +0200
Subject: [PATCH] pretty formatting of Sn table

---
 permutation.cc | 31 ++++++++++++++++++++++++-------
 t.cc           |  6 +++---
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/permutation.cc b/permutation.cc
index 79bb4dd..a25c62b 100644
--- a/permutation.cc
+++ b/permutation.cc
@@ -1371,7 +1371,7 @@ static T _antparity;
 
 
 template <typename T>
-void symetr(T ilin, T iel)
+static void symetr(T ilin, T iel)
 {
 
 if(ilin > (*_tyou_cols<T>)[1])
@@ -1398,7 +1398,7 @@ else
 
 
 template <typename T>
-void antisym(T icol,T iel)
+static void antisym(T icol,T iel)
 {
 
 if(icol > (*_tyou_rows<T>)[1])
@@ -1569,13 +1569,30 @@ return true;
 template <typename T>
 std::ostream & operator<<(std::ostream &s, const Sn_characters<T> &c)
 {
-//@@@improve formatting
-s<<"S"<<c.n<<" "<<c.classsizes;
-for(int i=1; i<=c.classes.size(); ++i) s<<"("<<c.classes[i]<<") "; s<<std::endl;
+const int w=4+c.n; //some reasonable width
+s<<"S"<<c.n<<" "<<c.classes.size()<<std::endl;
+s.width(w); s<<" ";
+for(int i=1; i<=c.classes.size(); ++i)
+	{
+	s.width(w); 
+        s<<c.classsizes[i]<<" ";
+	}
+s<<std::endl;
+s.width(w); s<<" ";
+for(int i=1; i<=c.classes.size(); ++i) 
+	{
+	std::ostringstream  classlabel;
+	classlabel<<"("<<c.classes[i]<<")";
+	s.width(w); 
+	s<<classlabel.str()<<" ";
+	} 
+s<<std::endl;
 for(int i=1; i<=c.chi.nrows(); ++i)
 	{
-	s<<"["<<c.irreps[i]<<"] ";
-	for(int j=1; j<=c.chi.ncols(); ++j) s<<c.chi(i,j)<<" ";
+	std::ostringstream irrep;
+	irrep<<"["<<c.irreps[i]<<"] ";
+	s.width(w); s<<irrep.str();
+	for(int j=1; j<=c.chi.ncols(); ++j) {s.width(w); s<<c.chi(i,j)<<" ";}
 	s<<std::endl;
 	}
 
diff --git a/t.cc b/t.cc
index 3325c82..6634357 100644
--- a/t.cc
+++ b/t.cc
@@ -2146,19 +2146,19 @@ int tot=p.generate_all_lex(printme);
 cout <<"generated "<<tot<<endl;
 }
 
-if(1)
+if(0)
 {
 int n;
 cin >>n >>unitary_n;
 Partition<int> p(n);
 space_dim=0;
 int tot=p.generate_all(pprintme,0);
-cout <<"generated "<<tot<<endl;
+cout <<"partitions generated "<<tot<<endl;
 if(tot!=partitions(n)) laerror("internal error in partition generation or enumerations");
 if(space_dim!=longpow(unitary_n,n)) {cout<<space_dim<<" "<<ipow(unitary_n,n)<<endl;laerror("integer overflow or internal error in space dimensions");}
 }
 
-if(0)
+if(1)
 {
 int n;
 cin >>n ;