[all] Remove SOFA_FLOAT (all steps)

SofaKernel/modules/SofaBaseLinearSolver/SofaBaseLinearSolver_test/Matrix_test.cpp

@@ -23,7 +23,7 @@
 /** Sparse matrix test suite.
  *
  * The same suite is instanciated using different parameters: entry types
- * (float/double) and BlockMN size in CompressedRowSparse.
+ * (float/Real) and BlockMN size in CompressedRowSparse.
 */
 
 #include <SofaTest/Sofa_test.h>
@@ -47,14 +47,14 @@
 #if BENCHMARK_MATRIX_PRODUCT
 #include <ctime>
 using sofa::helper::system::thread::CTime;
-double get_time() {
+Real get_time() {
     CTime * timer;
-    return (double) timer->getTime();
+    return (Real) timer->getTime();
 }
 #endif
 
-
-namespace sofa {
+namespace sofa
+{
 
 
 /** Sparse matrix test suite.
@@ -244,7 +244,7 @@ struct TestSparseMatrices : public Sofa_test<_Real>
             a.beginRow(i);
             for( unsigned j=0; j<NCOLS; j++)
             {
-                double valij = i*NCOLS+j;
+                Real valij = i*NCOLS+j;
                 a.insertBack(i,j,valij);
                 if( i==j )
                     b.add(i,j,valij);
@@ -253,21 +253,17 @@ struct TestSparseMatrices : public Sofa_test<_Real>
         a.compress();
         b.compress();
 
-        //    cerr<<"MatrixTest<Real,RN,CN>::checkEigenMatrixUpdate, a = " << a << endl;
-        //    cerr<<"MatrixTest<Real,RN,CN>::checkEigenMatrixUpdate, b incomplete = " << b << endl;
-
         // second pass for b. Some values are set with the right value, some with the wrong value, some are not set
         for( unsigned j=0; j<NCOLS; j++)
         {
             for( unsigned i=0; i<NROWS; i++)
             {
-                double valij = i*NCOLS+j;
+                Real valij = i*NCOLS+j;
                 if( i!=j )
                     b.add(i,j,valij);
             }
         }
         b.compress();
-        //    cerr<<"MatrixTest<Real,RN,CN>::checkEigenMatrixUpdate, b complete = " << b << endl;
         return Sofa_test<_Real>::matrixMaxDiff(a,b) < 100 * Sofa_test<_Real>::epsilon();
     }
 
@@ -279,11 +275,7 @@ struct TestSparseMatrices : public Sofa_test<_Real>
         unsigned br=3, bc=3;
         ma.resize(br*BROWS,bc*BCOLS);
 
-
-
-
         // building with unordered blocks
-
         mb.resizeBlocks(br,bc);
         for( unsigned i=0; i<br; i++ )
         {
@@ -307,15 +299,8 @@ struct TestSparseMatrices : public Sofa_test<_Real>
         }
         mb.compress();
 
-
-        //    serr()<<"MatrixTest<Real,RN,CN>::checkEigenMatrixBlockRowFilling, ma = " << ma << endl;
-        //    serr()<<"MatrixTest<Real,RN,CN>::checkEigenMatrixBlockRowFilling, mb = " << mb << endl;
         ASSERT_TRUE( Sofa_test<_Real>::matrixMaxDiff(ma,mb) < 100*Sofa_test<_Real>::epsilon() );
 
-
-
-
-
         // building with ordered blocks
 
         mb.resizeBlocks(br,bc);
@@ -404,10 +389,6 @@ struct TestSparseMatrices : public Sofa_test<_Real>
 
     bool checkEigenMatrixBlockFromCompressedRowSparseMatrix()
     {
-//        if( !matricesAreEqual(crs1,eiBlock3)){
-//            cout<<"heckEigenMatrixBlockFromCompressedRowSparseMatrix, crs1 = " << crs1 << endl;
-//            cout<<"heckEigenMatrixBlockFromCompressedRowSparseMatrix, eiBlock3 = " << eiBlock3 << endl;
-//        }
         return Sofa_test<_Real>::matrixMaxDiff(crs1,eiBlock3) < 100*Sofa_test<_Real>::epsilon();
     }
 
@@ -425,48 +406,47 @@ struct TestSparseMatrices : public Sofa_test<_Real>
     }
 };
 
-#ifndef SOFA_FLOAT
 ///////////////////
-// double precision
+// Real precision
 ///////////////////
 // trivial blocs
-typedef TestSparseMatrices<double,4,8,4,8> Ts4848;
+typedef TestSparseMatrices<SReal,4,8,4,8> Ts4848;
 #define TestMatrix Ts4848
 #include "Matrix_test.inl"
 #undef TestMatrix
 
 //// semi-trivial blocs
-typedef TestSparseMatrices<double,4,8,4,2> Ts4842;
+typedef TestSparseMatrices<SReal,4,8,4,2> Ts4842;
 #define TestMatrix Ts4842
 #include "Matrix_test.inl"
 #undef TestMatrix
 
-typedef TestSparseMatrices<double,4,8,1,8> Ts4818;
+typedef TestSparseMatrices<SReal,4,8,1,8> Ts4818;
 #define TestMatrix Ts4818
 #include "Matrix_test.inl"
 #undef TestMatrix
 
 // well-fitted blocs
-typedef TestSparseMatrices<double,4,8,2,2> Ts4822;
+typedef TestSparseMatrices<SReal,4,8,2,2> Ts4822;
 #define TestMatrix Ts4822
 #include "Matrix_test.inl"
 #undef TestMatrix
 
 /// not fitted blocs
-//typedef TestSparseMatrices<double,4,8,2,3> Ts4823;
+//typedef TestSparseMatrices<Real,4,8,2,3> Ts4823;
 //#define TestMatrix Ts4823
 //#include "Matrix_test.inl"
 //#undef TestMatrix
 
 
 #if BENCHMARK_MATRIX_PRODUCT
 ///// product timing
-typedef TestSparseMatrices<double,360,300,3,3> TsProductTimings;
+typedef TestSparseMatrices<Real,360,300,3,3> TsProductTimings;
 TEST_F(TsProductTimings, benchmark )
 {
     msg_info()<<"=== Matrix-Matrix Products:"<<std::endl;
 
-    double start, stop;
+    Real start, stop;
 
     matMultiplication.clear();
     start = get_time();
@@ -541,13 +521,13 @@ TEST_F(TsProductTimings, benchmark )
             }
         }
 
-        double min=std::numeric_limits<double>::max(), max=0, sum=0;
+        Real min=std::numeric_limits<Real>::max(), max=0, sum=0;
         for( int i=0; i<100 ; ++i )
         {
             start = get_time();
             res.noalias() = A * rhs;
             stop = get_time();
-            double current = stop-start;
+            Real current = stop-start;
             sum+=current;
             if( current<min ) min=current;
             if( current>max ) max=current;
@@ -558,15 +538,15 @@ TEST_F(TsProductTimings, benchmark )
 
 
     #ifdef _OPENMP
-        min=std::numeric_limits<double>::max(), max=0, sum=0;
+        min=std::numeric_limits<Real>::max(), max=0, sum=0;
         for( int i=0; i<100 ; ++i )
         {
             start = get_time();
 //            res.noalias() = typename Eigen::SparseDenseProductReturnType_MT<Eigen::SparseMatrix<SReal,Eigen::RowMajor>,Eigen::Matrix<SReal, Eigen::Dynamic, 1> >::Type( A.derived(), rhs.derived() );
 //            component::linearsolver::mul_EigenSparseDenseMatrix_MT( res, A, rhs );
             res.noalias() = component::linearsolver::mul_EigenSparseDenseMatrix_MT( A, rhs );
             stop = get_time();
-            double current = stop-start;
+            Real current = stop-start;
             sum+=current;
             if( current<min ) min=current;
             if( current>max ) max=current;
@@ -582,36 +562,4 @@ TEST_F(TsProductTimings, benchmark )
 
 #endif
 
-#endif
-
-#ifndef SOFA_DOUBLE
-///////////////////
-// simple precision
-// The macro EIGEN_DONT_ALIGN is needed for float on windows
-///////////////////
-// trivial blocs
-typedef TestSparseMatrices<float,4,8,4,8> Ts4848f;
-#define TestMatrix Ts4848f
-#include "Matrix_test.inl"
-#undef TestMatrix
-
-// semi-trivial blocs
-typedef TestSparseMatrices<float,4,8,4,2> Ts4842f;
-#define TestMatrix Ts4842f
-#include "Matrix_test.inl"
-#undef TestMatrix
-
-typedef TestSparseMatrices<float,4,8,1,8> Ts4818f;
-#define TestMatrix Ts4818f
-#include "Matrix_test.inl"
-#undef TestMatrix
-
-/// well-fitted blocs
-typedef TestSparseMatrices<float,4,8,2,2> Ts4822f;
-#define TestMatrix Ts4822f
-#include "Matrix_test.inl"
-#undef TestMatrix
-
-#endif
-
 }// namespace sofa

SofaKernel/modules/SofaRigid/SofaRigid_test/QuaternionIntegration_test.cpp

@@ -62,8 +62,6 @@ struct QuaternionIntegrationTest : Sofa_test< typename Rigid3Types::Real > {
 
         const real expected_angle = dt * deriv.getVOrientation().norm();
 
-        // std::clog << expected_angle << " " << angle << std::endl;
-
         // child coordinates given directly in parent frame
         ASSERT_TRUE(this->isSmall(expected_angle - angle, 10));
     }
@@ -73,19 +71,7 @@ struct QuaternionIntegrationTest : Sofa_test< typename Rigid3Types::Real > {
 
 // Define the list of types to instanciate. We do not necessarily need to test all combinations.
 using testing::Types;
-typedef Types<
-#ifndef SOFA_FLOAT
-    defaulttype::Rigid3dTypes
-#endif
-#ifndef SOFA_FLOAT
-#ifndef SOFA_DOUBLE
-    ,
-#endif
-#endif
-#ifndef SOFA_DOUBLE
-    defaulttype::Rigid3fTypes
-#endif
-> DataTypes; // the types to instanciate.
+typedef Types<defaulttype::Rigid3Types> DataTypes; // the types to instanciate.
 
 // Test suite for all the instanciations
 TYPED_TEST_CASE(QuaternionIntegrationTest, DataTypes);

applications/plugins/Compliant/Compliant_gui/CompliantAttachPerformer.cpp

@@ -32,70 +32,18 @@ namespace sofa
 {
 using namespace component::collision;
 
-namespace gui
-{
-//*******************************************************************************************
-//void CompliantAttachOperation::start()
-//{
-//    //Creation
-//    performer=component::collision::InteractionPerformer::InteractionPerformerFactory::getInstance()->createObject("CompliantAttach", pickHandle->getInteraction()->mouseInteractor.get());
-//    pickHandle->getInteraction()->mouseInteractor->addInteractionPerformer(performer);
-//    configurePerformer(performer);
-//    //Start
-//    performer->start();
-//}
-
-//void CompliantAttachOperation::execution()
-//{
-//    //do nothing
-//}
-
-//void CompliantAttachOperation::end()
-//{
-//    pickHandle->getInteraction()->mouseInteractor->removeInteractionPerformer(performer);
-//    delete performer; performer=0;
-//}
-
-//void CompliantAttachOperation::endOperation()
-//{
-//    pickHandle->getInteraction()->mouseInteractor->removeInteractionPerformer(performer);
-//}
-
-
-//void CompliantAttachOperation::configurePerformer(sofa::component::collision::InteractionPerformer* p)
-//{
-//    Operation::configurePerformer(p);
-//}
-
-
-}// gui
-
-
 namespace component
 {
 
 namespace collision
 {
 
-#ifndef SOFA_DOUBLE
-template class SOFA_Compliant_gui_API  CompliantAttachPerformer<defaulttype::Vec3fTypes>;
-template class SOFA_Compliant_gui_API  CompliantAttachPerformer<defaulttype::Rigid3fTypes>;
-#endif
-#ifndef SOFA_FLOAT
-template class SOFA_Compliant_gui_API  CompliantAttachPerformer<defaulttype::Vec3dTypes>;
-template class SOFA_Compliant_gui_API  CompliantAttachPerformer<defaulttype::Rigid3dTypes>;
-#endif
+template class SOFA_Compliant_gui_API  CompliantAttachPerformer<defaulttype::Vec3Types>;
+template class SOFA_Compliant_gui_API  CompliantAttachPerformer<defaulttype::Rigid3Types>;
 
+helper::Creator<InteractionPerformer::InteractionPerformerFactory, CompliantAttachPerformer<defaulttype::Vec3Types> >  CompliantAttachPerformerVec3dClass("CompliantAttach",true);
+helper::Creator<InteractionPerformer::InteractionPerformerFactory, CompliantAttachPerformer<defaulttype::Rigid3Types> >  CompliantAttachPerformerRigid3Class("CompliantAttach",true);
 
-#ifndef SOFA_DOUBLE
-helper::Creator<InteractionPerformer::InteractionPerformerFactory, CompliantAttachPerformer<defaulttype::Vec3fTypes> >  CompliantAttachPerformerVec3fClass("CompliantAttach",true);
-helper::Creator<InteractionPerformer::InteractionPerformerFactory, CompliantAttachPerformer<defaulttype::Rigid3fTypes> >  CompliantAttachPerformerRigid3fClass("CompliantAttach",true);
-
-#endif
-#ifndef SOFA_FLOAT
-helper::Creator<InteractionPerformer::InteractionPerformerFactory, CompliantAttachPerformer<defaulttype::Vec3dTypes> >  CompliantAttachPerformerVec3dClass("CompliantAttach",true);
-helper::Creator<InteractionPerformer::InteractionPerformerFactory, CompliantAttachPerformer<defaulttype::Rigid3dTypes> >  CompliantAttachPerformerRigid3dClass("CompliantAttach",true);
-#endif
 }
 }
 }

applications/plugins/Compliant/Compliant_gui/CompliantAttachPerformer.h

@@ -110,25 +110,14 @@ class SOFA_Compliant_gui_API CompliantAttachPerformer: public TInteractionPerfor
     ~CompliantAttachPerformer();
     virtual void configure(configurationsetting::MouseButtonSetting* setting);
 
-
     void start();
     void execute();
-
 };
 
-
-
-#if  !defined(SOFA_COMPONENT_COLLISION_CompliantAttachPerformer_CPP)
-#ifndef SOFA_DOUBLE
-extern template class SOFA_Compliant_gui_API  CompliantAttachPerformer<defaulttype::Vec3fTypes>;
-extern template class SOFA_Compliant_gui_API  CompliantAttachPerformer<defaulttype::Rigid3fTypes>;
+#if !defined(SOFA_COMPONENT_COLLISION_CompliantAttachPerformer_CPP)
+extern template class SOFA_Compliant_gui_API  CompliantAttachPerformer<defaulttype::Vec3Types>;
+extern template class SOFA_Compliant_gui_API  CompliantAttachPerformer<defaulttype::Rigid3Types>;
 #endif
-#ifndef SOFA_FLOAT
-extern template class SOFA_Compliant_gui_API  CompliantAttachPerformer<defaulttype::Vec3dTypes>;
-extern template class SOFA_Compliant_gui_API  CompliantAttachPerformer<defaulttype::Rigid3dTypes>;
-#endif
-#endif
-
 
 }
 }

applications/plugins/ExternalBehaviorModel/FEMGridBehaviorModel.cpp

@@ -37,20 +37,9 @@ using namespace sofa::defaulttype;
 
 // Register in the Factory (XML read/write...)
 int FEMGridBehaviorModelModelClass = core::RegisterObject("FEMGridBehaviorModel Example")
-#ifndef SOFA_FLOAT
-        .add< FEMGridBehaviorModel<Vec3dTypes> >()
-#endif
-#ifndef SOFA_DOUBLE
-        .add< FEMGridBehaviorModel<Vec3fTypes> >()
-#endif
-        ;
-
-#ifndef SOFA_FLOAT
-template class SOFA_ExternalBehaviorModel_API FEMGridBehaviorModel<Vec3dTypes>;
-#endif
-#ifndef SOFA_DOUBLE
-template class SOFA_ExternalBehaviorModel_API FEMGridBehaviorModel<Vec3fTypes>;
-#endif
+        .add< FEMGridBehaviorModel<Vec3Types> >();
+
+template class SOFA_ExternalBehaviorModel_API FEMGridBehaviorModel<Vec3Types>;
 
 
 } // namespace externalBehaviorModel