Added an allowedValues override to WorkspaceProperty, which returns the...

Added an allowedValues override to WorkspaceProperty, which returns the current contents of the ADS. Changed return type of allowedValues to vector (was set). Modified WorkspaceProperty::isValid so that it fetches output workspaces if they already exist in the ADS. Re #150.

Code/Mantid/API/inc/MantidAPI/WorkspaceProperty.h

@@ -24,7 +24,7 @@ namespace API
     @author Russell Taylor, Tessella Support Services plc
     @date 10/12/2007
     
-    Copyright © 2007-8 STFC Rutherford Appleton Laboratories
+    Copyright © 2007-8 STFC Rutherford Appleton Laboratory
 
     This file is part of Mantid.
 
@@ -120,27 +120,47 @@ public:
     // Assume that any declared WorkspaceProperty must have a name set (i.e. is not an optional property)
     if ( m_workspaceName.empty() ) return false;
     
-    // If an input workspace, check that it exists in the AnalysisDataService & can be cast to correct type
-    if ( ( m_direction==0 ) || ( m_direction==2 ) )
+    // If the WorkspaceProperty already points to something, don't go looking in the ADS
+    if ( ! this->operator()() )
     {
-      // If the WorkspaceProperty already points to something, don't go looking in the ADS
-      if ( ! this->operator()() )
-      {
-        try {
-          API::Workspace_sptr ws = API::AnalysisDataService::Instance().retrieve(m_workspaceName);
-          // Check retrieved workspace is the type that it should be
-          Kernel::PropertyWithValue< boost::shared_ptr<TYPE> >::m_value = boost::dynamic_pointer_cast<TYPE>(ws);
-          if ( ! Kernel::PropertyWithValue< boost::shared_ptr<TYPE> >::m_value ) return false;
-        } catch (Kernel::Exception::NotFoundError&) {
+      try {
+        Workspace_sptr ws = AnalysisDataService::Instance().retrieve(m_workspaceName);
+        // Check retrieved workspace is the type that it should be
+        Kernel::PropertyWithValue< boost::shared_ptr<TYPE> >::m_value = boost::dynamic_pointer_cast<TYPE>(ws);
+        if ( ! Kernel::PropertyWithValue< boost::shared_ptr<TYPE> >::m_value ) return false;
+      } catch (Kernel::Exception::NotFoundError&) {
+        // Only concerned with failing to find workspace in ADS if it's an input type
+        if ( ( m_direction==0 ) || ( m_direction==2 ) )
+        {
           return false;
         }
+        else
+        {
+          return true;
+        }
       }
     }
-    // Would be nice if we could do the creation of the output workspace here
     
     return true;
   }
 
+  /** Returns the current contents of the AnalysisDataService for input workspaces.
+   *  For output workspaces, an empty vector is returned
+   */
+  virtual const std::vector<std::string> allowedValues() const
+  {
+    if ( ( m_direction==0 ) || ( m_direction==2 ) )
+    {
+      // If an input workspace, get the list of workspaces currently in the ADS
+      return AnalysisDataService::Instance().getObjectNames();
+    }
+    else
+    {
+      // For output workspaces, just return an empty vector
+      return std::vector<std::string>();
+    }
+  }
+  
   /** If this is an output workspace, store it into the AnalysisDataService
    *  @return True if the workspace is an output workspace and has been stored
    *  @throw std::runtime_error if unable to store the workspace successfully

Code/Mantid/API/test/WorkspacePropertyTest.h

@@ -174,6 +174,20 @@ public:
     TS_ASSERT( wsp3->isValid() )
   }
 
+  void testAllowedValues()
+  {
+    std::vector<std::string> vals;
+    TS_ASSERT_THROWS_NOTHING( vals = wsp1->allowedValues() )
+    TS_ASSERT_EQUALS( vals.size(), 2 )
+    TS_ASSERT_EQUALS( vals[0], "ws1" )
+    TS_ASSERT_EQUALS( vals[1], "ws3" )
+    
+    TS_ASSERT( wsp2->allowedValues().empty() )
+
+    TS_ASSERT_THROWS_NOTHING( vals = wsp3->allowedValues() )
+    TS_ASSERT_EQUALS( vals.size(), 2 )
+  }
+  
   void testStore()
   {
     // This is an input workspace so should return false
@@ -200,6 +214,13 @@ public:
     TS_ASSERT( ! wsp3->operator()() )
   }
 
+  void testDirection()
+  {
+    TS_ASSERT_EQUALS( wsp1->direction(), 0 )
+    TS_ASSERT_EQUALS( wsp2->direction(), 1 )
+    TS_ASSERT_EQUALS( wsp3->direction(), 2 )
+  }
+  
 private:
   WorkspaceProperty<Workspace> *wsp1;
   WorkspaceProperty<Workspace> *wsp2;

Code/Mantid/Algorithms/src/ConvertUnits.cpp

@@ -37,8 +37,7 @@ void ConvertUnits::init()
   declareProperty(new WorkspaceProperty<API::Workspace>("OutputWorkspace","",Direction::Output));
 
   // Extract the current contents of the UnitFactory to be the allowed values of the Target property
-  std::vector<std::string> allUnits = UnitFactory::Instance().getKeys();
-  declareProperty("Target","",new ListValidator(allUnits));
+  declareProperty("Target","",new ListValidator(UnitFactory::Instance().getKeys()) );
   declareProperty("Emode",0);
   declareProperty("Efixed",0.0);
 }

Code/Mantid/Kernel/inc/MantidKernel/ListValidator.h

@@ -48,7 +48,7 @@ public:
   /** Constructor
    *  @param values A vector of strings containing the valid values 
    */
-  explicit ListValidator(const std::vector<std::string> values) : 
+  explicit ListValidator(const std::vector<std::string>& values) : 
     IValidator<std::string>(),
     m_allowedValues(values.begin(),values.end())
   {}

Code/Mantid/Kernel/inc/MantidKernel/Property.h

@@ -6,7 +6,7 @@
 //----------------------------------------------------------------------
 #include <string>
 #include <typeinfo>
-#include <set>
+#include <vector>
 #include "System.h"
 
 namespace Mantid
@@ -21,7 +21,7 @@ namespace Kernel
     @author Based on the Gaudi class of the same name (see http://proj-gaudi.web.cern.ch/proj-gaudi/)
     @date 13/11/2007
     
-    Copyright &copy; 2007 STFC Rutherford Appleton Laboratories
+    Copyright &copy; 2007-8 STFC Rutherford Appleton Laboratory
 
     This file is part of Mantid.
 
@@ -63,7 +63,7 @@ public:
 	/// Set the value of the property via a string
 	virtual bool setValue( const std::string& value ) = 0;
 	
-	virtual const std::set<std::string> allowedValues() const;
+	virtual const std::vector<std::string> allowedValues() const;
 	
 protected:
   /// Constructor

Code/Mantid/Kernel/inc/MantidKernel/PropertyWithValue.h

@@ -265,19 +265,20 @@ public:
   }
 
   /** Returns the set of valid values for this property, if such a set exists.
-   *  If not, it returns an empty set.
+   *  If not, it returns an empty vector.
    */  
-  virtual const std::set<std::string> allowedValues() const
+  virtual const std::vector<std::string> allowedValues() const
   {
     ListValidator *list = dynamic_cast<ListValidator*>(m_validator);
     if (list)
     {
-      return list->allowedValues();
+      const std::set<std::string>& vals = list->allowedValues();
+      return std::vector<std::string>(vals.begin(), vals.end());
     }
     else
     {
-      // Just return an empty set if the property does not have a ListValidator
-      return std::set<std::string>();
+      // Just return an empty vector if the property does not have a ListValidator
+      return std::vector<std::string>();
     }
   }
   

Code/Mantid/Kernel/src/Property.cpp

@@ -101,9 +101,9 @@ void Property::setDocumentation( const std::string& documentation )
 /** Returns the set of valid values for this property, if such a set exists.
  *  If not, it returns an empty set.
  */
-const std::set<std::string> Property::allowedValues() const
+const std::vector<std::string> Property::allowedValues() const
 {
-  return std::set<std::string>();
+  return std::vector<std::string>();
 }
 
 } // namespace Kernel

Code/Mantid/Kernel/test/PropertyWithValueTest.h

@@ -270,6 +270,11 @@ public:
     TS_ASSERT( ! p.setValue("three") )
     TS_ASSERT_EQUALS( p.value(), "two" )
     TS_ASSERT( p.isValid() )
+    std::vector<std::string> vals;
+    TS_ASSERT_THROWS_NOTHING( vals = p.allowedValues() )
+    TS_ASSERT_EQUALS( vals.size(), 2 )
+    TS_ASSERT_EQUALS( vals[0], "one" )
+    TS_ASSERT_EQUALS( vals[1], "two" )
   }
 
 private:

Code/Mantid/Main/Main.cpp

@@ -3,7 +3,7 @@
 #include "Benchmark.h"
 #include "UserAlgorithmTest.h"
 #include "MantidAPI/FrameworkManager.h"
-//#include "MantidAPI/Workspace.h"
+#include "MantidAPI/Workspace.h"
 //#include "MantidDataObjects/Workspace1D.h" 
 //#include "MantidDataObjects/Workspace2D.h" 
 
@@ -18,17 +18,33 @@ int main()
 
   FrameworkManager::Instance();
 
-  UserAlgorithmTest userTest;
-  userTest.RunAllTests();
+//  UserAlgorithmTest userTest;
+//  userTest.RunAllTests();
   
  // Benchmark b;
  // b.RunPlusTest();
     
-#if defined _DEBUG
+//#if defined _DEBUG
   //NOTE:  Any code in here is temporary for debugging purposes only, nothing is safe!
 
+  IAlgorithm *loader = FrameworkManager::Instance().createAlgorithm("LoadRaw");
+  //  loader->initialize();   
+  loader->setPropertyValue("OutputWorkspace","ws");   
+  loader->setPropertyValue("Filename","/mnt/isishome/wmx35332/Test/Data/GEM38370.raw");   
+  
+  loader->execute();    
+  if (loader->isExecuted()){ std::cout << "RAW file loaded!" << std::endl; }    
+  
+  IAlgorithm *convert = FrameworkManager::Instance().createAlgorithm("ConvertUnits");   
+  convert->setPropertyValue("InputWorkspace","ws");   
+  convert->setPropertyValue("OutputWorkspace","ws");   
+  convert->setPropertyValue("Target","MomentumTransfer");   
+  convert->execute();   
+  if (convert->isExecuted()){ std::cout << "Units converted!" << std::endl; }
+  
+//  Workspace* output = FrameworkManager::Instance().getWorkspace("outer");  
 
-#endif
+//#endif
 
   FrameworkManager::Instance().clear();
   exit(0);