Changeset 12008

Timestamp:

05/20/08 00:01:56 (7 months ago)

Author:

ayu

Message:

• optimized g++ options
  
• removed unused variable.
  

Location:

lang/cplusplus/misc/clustercpp/src

Files:

• Makefile (modified) (1 diff)
• ward.cpp (modified) (3 diffs)

lang/cplusplus/misc/clustercpp/src/Makefile

@@ -1 +1 @@
 ward: ward.cpp
-        g++ -g -o ward -I../include ward.cpp
+        g++ -O3 -ffast-math -funroll-loops -Wall -fno-common -march=nocona -o ward -I../include ward.cpp

lang/cplusplus/misc/clustercpp/src/ward.cpp

@@ -39 +39 @@
       MATRIXROWP p = MATRIXROWP(new MATRIXROW);
       mat->insert(MATRIX::value_type(i, p));
-      INDEX s = v.size();
       for(INDEX j=0; j<i; j++){
         VECTOR& u = vectors[j]; 
@@ -112 +111 @@
       kieta.insert(q);
       //キャッシュから、今回消えるものをあらかじめ排除
-      if(hascache(p)) caches->erase(p);
-      if(hascache(q)) caches->erase(q);
+      caches->erase(p);
+      caches->erase(q);
       //std::cout << "erased" << std::endl;
 
@@ -163 +162 @@
         }         
       }
-      caches->erase(p);
-      caches->erase(q);  
       //std::cout << "len(cache) " << caches->size() << std::endl;
       mat->erase(p);