Compactise AlgorithmHistory printout. Re #179.

Code/Mantid/API/src/AlgorithmHistory.cpp

@@ -18,8 +18,6 @@ AlgorithmHistory::AlgorithmHistory(const Algorithm* const alg, const dateAndTime
   m_name(alg->name()), m_version(alg->version()), m_executionDate(start), m_executionDuration(duration)
 {
   // Now go through the algorithm's properties and create the PropertyHistory objects.
-  // Would like to have PropertyManager & Property do this but can't because PropertyHistory has to know
-  // about Workspace Properties, which is in API whereas PropertyManager/Property are in Kernel.
   const std::vector<Property*>& properties = alg->getProperties();
   std::vector<Property*>::const_iterator it;
   for (it = properties.begin(); it != properties.end(); ++it)
@@ -58,8 +56,8 @@ void AlgorithmHistory::addExecutionInfo(const dateAndTime& start, const double&
  */
 void AlgorithmHistory::printSelf(std::ostream& os, const int indent)const
 {
-  os << std::string(indent,' ') << "Name : " << m_name << std::endl;
-  os << std::string(indent,' ') << "Version: " << m_version << std::endl;
+  os << std::string(indent,' ') << "Algorithm: " << m_name;
+  os << std::string(indent,' ') << " v" << m_version << std::endl;
   if (m_executionDate)
   {
     char buffer [25];
@@ -72,7 +70,6 @@ void AlgorithmHistory::printSelf(std::ostream& os, const int indent)const
 
   for (it=m_properties.begin();it!=m_properties.end();it++)
   {
-    os << std::endl;
     it->printSelf( os, indent+2 );
   }
 }

Code/Mantid/API/test/AlgorithmHistoryTest.h

@@ -33,21 +33,19 @@ class AlgorithmHistoryTest : public CxxTest::TestSuite
 public:
   void testPopulate()
   {
-    std::string correctOutput = "Name : testalg\n";
-    correctOutput = correctOutput + "Version: 1\n";
+    std::string correctOutput = "Algorithm: testalg ";
+    correctOutput = correctOutput + "v1\n";
     correctOutput = correctOutput + "Execution Date: 2008-Feb-29 09:54:49\n";
     correctOutput = correctOutput + "Execution Duration: 14 seconds\n";
     correctOutput = correctOutput + "Parameters:\n";
-    correctOutput = correctOutput + "\n";
-    correctOutput = correctOutput + "  Name: arg1_param\n";
-    correctOutput = correctOutput + "  Value: 20\n";
-    correctOutput = correctOutput + "  isDefault: No\n";
-    correctOutput = correctOutput + "  Direction: Input\n";
-    correctOutput = correctOutput + "\n";
-    correctOutput = correctOutput + "  Name: arg2_param\n";
-    correctOutput = correctOutput + "  Value: 23\n";
-    correctOutput = correctOutput + "  isDefault: Yes\n";
-    correctOutput = correctOutput + "  Direction: N/A\n";
+    correctOutput = correctOutput + "  Name: arg1_param, ";
+    correctOutput = correctOutput + "Value: 20, ";
+    correctOutput = correctOutput + "Default?: No, ";
+    correctOutput = correctOutput + "Direction: Input\n";
+    correctOutput = correctOutput + "  Name: arg2_param, ";
+    correctOutput = correctOutput + "Value: 23, ";
+    correctOutput = correctOutput + "Default?: Yes, ";
+    correctOutput = correctOutput + "Direction: N/A\n";
 
     //set the time
     std::time_t rawtime;

Code/Mantid/DataObjects/test/WorkspaceHistoryTest.h

@@ -216,7 +216,7 @@ public:
     TS_ASSERT_THROWS_NOTHING( s << C_WH )
     // Check size (in bytes) of output
     int i = s.tellp();
-    TS_ASSERT_LESS_THAN( 1350, i )
+    TS_ASSERT_LESS_THAN( 1200, i )
     // Check first line
     s.seekp(0);
     char c[21];

Code/Mantid/Kernel/src/PropertyHistory.cpp

@@ -50,10 +50,10 @@ PropertyHistory& PropertyHistory::operator=(const PropertyHistory& A)
  */
 void PropertyHistory::printSelf(std::ostream& os, const int indent) const
 {
-  os << std::string(indent,' ') << "Name: " << m_name << std::endl;
-  os << std::string(indent,' ') << "Value: " << m_value << std::endl;
-  os << std::string(indent,' ') << "isDefault: "<< (m_isDefault ? "Yes" : "No") << std::endl;
-  os << std::string(indent,' ') << "Direction: " << Kernel::Direction::asText(m_direction) << std::endl;
+  os << std::string(indent,' ') << "Name: " << m_name;
+  os << ", Value: " << m_value;
+  os << ", Default?: "<< (m_isDefault ? "Yes" : "No");
+  os << ", Direction: " << Kernel::Direction::asText(m_direction) << std::endl;
 }
 
 /** Prints a text representation

Code/Mantid/Kernel/test/PropertyHistoryTest.h

@@ -13,9 +13,9 @@ public:
 
   void testPopulate()
   {
-    std::string correctOutput = "Name: arg1_param\n";
-    correctOutput = correctOutput + "Value: 20\n";
-    correctOutput = correctOutput + "isDefault: Yes\n";
+    std::string correctOutput = "Name: arg1_param, ";
+    correctOutput = correctOutput + "Value: 20, ";
+    correctOutput = correctOutput + "Default?: Yes, ";
     correctOutput = correctOutput + "Direction: Input\n";
 
     // Not really much to test