Merge pull request #1645 from jessdtate/conditional

new Boolean comparison module

Author: dcwhite

src/Core/Algorithms/Math/BooleanCompareAlgo.cc

@@ -0,0 +1,73 @@
+/*
+   For more information, please see: http://software.sci.utah.edu
+
+   The MIT License
+
+   Copyright (c) 2009 Scientific Computing and Imaging Institute,
+   University of Utah.
+
+   
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef CORE_ALGORITHMS_MATH_BooleanCompareALGO_H
+#define CORE_ALGORITHMS_MATH_BooleanCompareALGO_H
+
+#include <Core/Datatypes/Matrix.h>
+#include <Core/Datatypes/DenseMatrix.h>
+#include <Core/Datatypes/DenseColumnMatrix.h>
+
+
+#include <string>
+#include <sstream>
+#include <vector>
+#include <algorithm>
+
+#include <Core/Algorithms/Base/AlgorithmVariableNames.h>
+#include <Core/Algorithms/Base/AlgorithmBase.h>
+#include <Core/Algorithms/Math/share.h>
+
+namespace SCIRun {
+namespace Core {
+namespace Algorithms {
+namespace Math {
+
+  ALGORITHM_PARAMETER_DECL(Value_Option_1);
+  ALGORITHM_PARAMETER_DECL(Value_Option_2);
+  ALGORITHM_PARAMETER_DECL(Then_Option);
+  ALGORITHM_PARAMETER_DECL(Else_Option);
+  ALGORITHM_PARAMETER_DECL(Comparison_Option);
+                           
+class SCISHARE BooleanCompareAlgo : public AlgorithmBase
+{
+
+  public:
+    BooleanCompareAlgo();
+    AlgorithmOutput run(const AlgorithmInput& input) const;
+  bool runImpl(Datatypes::DenseMatrixHandle matrixa, Datatypes::DenseMatrixHandle matrixb, std::string valoptA, std::string valoptB, std::string& cond_statement, int& cond_state) const;
+  bool runImpl(Datatypes::DenseMatrixHandle matrixa, std::string valoptA, std::string& cond_statement, int& cond_state) const;
+  bool return_check(int& cond_state, Datatypes::DenseMatrixHandle& cond_matrix, Datatypes::MatrixHandle& out_matrix, std::string then_result, std::string else_result, Datatypes::MatrixHandle matrixa, Datatypes::MatrixHandle matrixb, Datatypes::MatrixHandle possout) const;
+  bool return_value(Datatypes::MatrixHandle& out_matrix, std::string result_statement, Datatypes::MatrixHandle first, Datatypes::MatrixHandle second, Datatypes::MatrixHandle possout) const;
+  bool CompareMatrix(Datatypes::DenseMatrixHandle mata, Datatypes::DenseMatrixHandle matb, std::string cond_statement, int& cond_state) const;
+  bool CompareMatrix(Datatypes::DenseMatrixHandle mata, int& cond_state) const;
+  double ComputeNorm(Datatypes::DenseMatrixHandle mat) const;
+};
+
+      }}}}// end SCIRun namespace
+#endif

src/Core/Algorithms/Math/BooleanCompareAlgo.h

@@ -45,6 +45,7 @@ SET(Algorithms_Math_SRCS
   ComputePCA.cc
   CollectMatrices/CollectMatricesAlgorithm.cc
   ReportMatrixSliceMeasureAlgo.cc
+  BooleanCompareAlgo.cc
 )
 
 SET(Algorithms_Math_HEADERS
@@ -67,6 +68,7 @@ SET(Algorithms_Math_HEADERS
   ComputePCA.h
   CollectMatrices/CollectMatricesAlgorithm.h
   ReportMatrixSliceMeasureAlgo.h
+  BooleanCompareAlgo.h
 )
 
 SCIRUN_ADD_LIBRARY(Algorithms_Math 

src/Core/Algorithms/Math/CMakeLists.txt

@@ -1648,7 +1648,28 @@ \section{Common Build Errors}
       'Interface/Modules/Field/ui_ConvertMeshToPointCloudDialog.h' file not found
 \end{verbatim}
 In this instance, the path to the header is misspelled.  Check for the correct path and filename.  Make sure the file you want to include exists.  If the code was converted from SCIRun4, some of the dependent header files are renamed, combined with other files, or deprecated.  
-
+\item
+\begin{verbatim}
+/Users/jess/software/SCIRun_mine/bin/SCIRun/Core/Algorithms/Factory/AlgorithmFactoryImpl_Generated.cc:4:10: error: empty filename
+#include <>
+         ^
+/Users/jess/software/SCIRun_mine/bin/SCIRun/Core/Algorithms/Factory/AlgorithmFactoryImpl_Generated.cc:21:43: error: expected namespace name
+using namespace SCIRun::Core::Algorithms::;
+                                          ^
+/Users/jess/software/SCIRun_mine/bin/SCIRun/Core/Algorithms/Factory/AlgorithmFactoryImpl_Generated.cc:39:3: error: expected expression
+  ADD_MODULE_ALGORITHM_GENERATED(, );
+\end{verbatim}
+This is a result of something wrong with the module configuration file.  Check the spelling and syntax of the new file.  Specifically, check the quotation characters used, as they may be different (for instance on mac TextEdit).  This may also be caused if the Algorithm and other files have not been added to the `CMakeList.txt' file.  
+\item
+\begin{verbatim}
+/Users/jess/software/SCIRun_mine/src/Interface/Modules/Base/ModuleDialogGeneric.h:71:5: warning: 'metaObject' overrides a member function but is not marked
+      'override' [-Winconsistent-missing-override]
+    Q_OBJECT
+    ^
+/usr/local/Cellar/qt/4.8.7_3/lib/QtCore.framework/Headers/qobjectdefs.h:162:32: note: expanded from macro 'Q_OBJECT'
+    virtual const QMetaObject *metaObject() const; \
+\end{verbatim}
+Errors that involve qt and qt objects deal with the gui code.  Make sure that the gui name is spelled correctly.  Also make sure that the Qobject name is set properly.  
 \end{itemize}