Undebugged portion deleted. Better write again!

Author: shiozaki

src/Makefile.am

@@ -1,6 +1,6 @@
 SUBDIRS = dg ig .
 bin_PROGRAMS = CCGEN
 CCGEN_SOURCES = binarycontraction.cc cost.cc equation.cc index.cc main.cc pretensor.cc smartindex.cc tensor.cc tree.cc vectensor.cc \
-                binarycontraction_impl.cc indexspace.cc spaces.cc smartindexlist.cc block.cc tensor_impl.cc
+                smartindexlist.cc #block.cc tensor_impl.cc binarycontraction_impl.cc
 LDADD = dg/libdg.a ig/libig.a -lblas -llapack -L/opt/local/lib -lboost_regex
 AM_CXXFLAGS=-I$(top_srcdir)

src/binarycontraction.cc

@@ -96,7 +96,6 @@ void BinaryContraction::determine_target_indices(const vector<shared_ptr<Tensor>
     // collecting indices that are not going to be summed...
     int counter = 0;
     for (auto siter = si_first.begin(); siter != si_first.end(); ++siter, ++counter) {
-      siter->set_sindex(counter);
       if (!siter->target_tensor() || !siter->target_tensor()->in_list(tensors.at(1)->regtensors()) )  // if not contraction indices
         target_indices.push_back(*siter);
       else
@@ -105,7 +104,6 @@ void BinaryContraction::determine_target_indices(const vector<shared_ptr<Tensor>
     list<SmartIndex> si_second = tensors.at(1)->smartindices()->si();
     counter = 0;
     for (auto siter = si_second.begin(); siter != si_second.end(); ++siter, ++counter) {
-      siter->set_sindex(counter);
       if (!siter->target_tensor() || !siter->target_tensor()->in_list(tensors.at(0)->regtensors()) ) // if not contraction indices 
         target_indices.push_back(*siter);
       else
@@ -147,7 +145,6 @@ void BinaryContraction::determine_target_indices(const vector<shared_ptr<Tensor>
   }
 
 
-  target_tensor_->set_rank(target_tensor_->indexinfo()->smartindices()->indexlist().size());
 }
 
 

src/binarycontraction.h

@@ -18,15 +18,6 @@ class BinaryContraction {
     void determine_target_indices(const std::vector<std::shared_ptr<Tensor> >&);
     void refresh_indices();
 
-    // For implementation
-    std::vector<std::vector<Block> > outerloop_;
-    std::vector<std::vector<Block> > innerloop1_;
-    std::vector<std::vector<Block> > innerloop2_;
-    // Loop indices that reflects which index has come from which tensor etc.
-    std::shared_ptr<SmartIndexList> loop_indices_; 
-    std::shared_ptr<SmartIndexList> prod_indices_; 
-    std::shared_ptr<SmartIndexList> prod_indices2_; 
-
   public:
     BinaryContraction(std::vector<std::shared_ptr<Tensor> >&, std::shared_ptr<Tensor>);
     BinaryContraction() {};

src/binarycontraction_impl.cc

@@ -1,6 +1,6 @@
 //
-// Author:: Toru Shiozaki
-// Date  :: Feb 2009
+// Author : Toru Shiozaki
+// Date   : Feb 2009
 //
 
 #include <cassert>

src/block.cc

@@ -1,6 +1,6 @@
 //
-// Author:: Toru Shiozaki
-// Date  :: Feb 2009
+// Author : Toru Shiozaki
+// Date   : Feb 2009
 //
 #ifndef _smith_equation_h
 #define _smith_equation_h

src/block.h

@@ -13,7 +13,7 @@
 
 using namespace std;
 
-Index::Index(const string indx, const Spaces& sp) {
+Index::Index(const string indx) {
 
   const boost::regex dagger_reg("\\+");
   boost::smatch what;
@@ -35,16 +35,6 @@ Index::Index(const string indx, const Spaces& sp) {
     throw std::invalid_argument(error_message.str());
   }
 
-  if (type_ == "h") {
-    indexspace_ = sp.occ_space();
-  } else if (type_ == "p") {
-    indexspace_ = sp.vir_space();
-  } else {
-    stringstream error_message; error_message << "index other than holes and particles hasn't been implemented in file: "
-                                 << __FILE__ << " line: " << __LINE__;
-    throw logic_error(error_message.str());
-  }
-
 }
 
 Index::~Index() {