Commits

Qian Zhu committed 7b00359 Merge

Merge

Comments (0)

Files changed (6)

 
 	void GetGeneNames( std::vector<std::string>& vecstrGenes ) const {
 
-		return COntologyImpl::GetGeneNames( vecstrGenes ); }
+		 COntologyImpl::GetGeneNames( vecstrGenes ); }
 
 	void TermFinder( const CGenes& Genes, std::vector<STermFound>& vecsTerms, bool fBonferroni = true,
 		bool fRecursive = true, bool fGenome = false, float dPValue = 1,
 		const CGenes* pBackground = NULL ) const {
 
-		return COntologyImpl::TermFinder( Genes, vecsTerms, fBonferroni, fRecursive, fGenome, dPValue,
+		 COntologyImpl::TermFinder( Genes, vecsTerms, fBonferroni, fRecursive, fGenome, dPValue,
 			pBackground ); }
 
 	size_t GetNode( const std::string& strID ) const {
 	CDistanceMatrix	Dist;
 
 	InitializeDistances( MatData, pMeasure, Dist, pMatWeights );
-	return Cluster( Dist, dMinDiameter, dMaxDiameter, dDeltaDiameter, iSize, MatResults ); }
+	 Cluster( Dist, dMinDiameter, dMaxDiameter, dDeltaDiameter, iSize, MatResults ); }
 
 /*!
  * \brief
 	void Initialize( size_t iSize, unsigned char cValues, bool fClear ) {
 
 		m_iSize = (uint32_t)iSize;
-		return CCompactMatrixBase::Initialize( cValues, fClear ); }
+		CCompactMatrixBase::Initialize( cValues, fClear ); }
 
 	/*!
 	 * \brief
 	}
 
 	void AveStd( double& a, double& b, size_t& c){
-		return CDatImpl::AveStd(a, b, c);
+		 CDatImpl::AveStd(a, b, c);
 	}
 
 	void Clear( float dValue ) {
 		size_t	i, j;
 
 		if( iOffset < 0 )
-			return Add( strTwo, strOne, -iOffset );
+			 Add( strTwo, strOne, -iOffset );
 		i = CPSTImpl::Add( strOne, 0, m_sRoot );
 		j = CPSTImpl::Add( strTwo, iOffset, m_sRoot );
 		if( ( i = max( i, j ) ) > m_iDepth )

tools/SVMperfer/SVMperfer.cpp

 			cerr << "Could not open input PCL" << endl;
 			return 1;
 		}
+        if (sArgs.normalize_flag)
+                PCL.Normalize(CPCL::ENormalizeRow);
+
+
 	}
 
 	vector<SVMLight::SVMLabel> vecLabels;