Changeset 66654ee in tol


Ignore:
Timestamp:
Feb 13, 2012, 8:51:33 AM (15 years ago)
Author:
Víctor de Buen <vdebuen@…>
Branches:
1941-docker-image-to-test, devel, master
Children:
554f1be
Parents:
d2cf6f7
Message:

Refs #1407
Cleaning parser traces

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4118 be4846ae-f051-483a-831f-b64e7d08527f

Location:
tol/btol/vmatrix_type
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • tol/btol/vmatrix_type/tol_bvmat_bsr_impl.h

    rd2cf6f7 r66654ee  
    276276  void action(const std::string& str) const
    277277  {
    278     Std(BSR()+"TRACE "+msg_.c_str()+" : '"+str.c_str()+"'");
     278    //Std(BSR()+"TRACE "+msg_.c_str()+" : '"+str.c_str()+"'");
    279279  }
    280280  void operator()(const std::string& str) const
    … …  
    649649    if(!(*numEqu_))
    650650    {
    651       Std(BSR()+" Parsed "+*(t->var_count_)+" linear block variables \n");
     651    //Std(BSR()+" Parsed "+*(t->var_count_)+" linear block variables \n");
    652652    }
    653653    *(t->numEqu_) += size;
    … …  
    16761676    {
    16771677      iniTime_ = (double)time(0);
    1678       Std(BSR()+" Parsed "+(*mis_count_)+" missing variables \n");
    1679       Std(BSR()+" Parsed "+(*sig_count_)+" sigma variables \n");
    1680       Std(BSR()+" Parsed "+(*noise_count_)+" vectors of noise  \n");
     1678    //Std(BSR()+" Parsed "+(*mis_count_)+" missing variables \n");
     1679    //Std(BSR()+" Parsed "+(*sig_count_)+" sigma variables \n");
     1680    //Std(BSR()+" Parsed "+(*noise_count_)+" vectors of noise  \n");
    16811681    }
    16821682    if(equ_vec_->capacity()<n+1) { equ_vec_->reserve(int((n+1)*1.20)); }
    … …  
    16971697      double elapsed = time(0) - iniTime_;
    16981698      double remain  = elapsed*double((*numEqu_)-n)/double(n);
    1699       Std(BSR()+" Parsed "+n+" equations of "+(*numEqu_)+" ["+ratio+"%] "
    1700           "in "+elapsed+" seconds (remaining "+remain+" s.)\n");
     1699    //Std(BSR()+" Parsed "+n+" equations of "+(*numEqu_)+" ["+ratio+"%] "
     1700    //    "in "+elapsed+" seconds (remaining "+remain+" s.)\n");
    17011701    }
    17021702  }
    … …  
    17391739    if(n && !(n%1000))
    17401740    {
    1741       Std(BSR()+" Parsed "+n+" inequations \n");
     1741    //Std(BSR()+" Parsed "+n+" inequations \n");
    17421742    }
    17431743  }

  • tol/btol/vmatrix_type/vmat_bsr.cpp

    rd2cf6f7 r66654ee  
    145145{
    146146  int i,j,k;
    147   Std(BSR()+"Setting input and output missing block\n");
     147//Std(BSR()+"Setting input and output missing block\n");
    148148  int inputMisSize = 0;
    149149  int outputMisSize = 0;

  • tol/btol/vmatrix_type/vmat_bsr_joint.cpp

    rd2cf6f7 r66654ee  
    589589    int m = equ_vec.size();
    590590    int r = ine_vec.size();
    591     Std(BSR()+" Parsed "+r+" inequations \n");
    592     Std(BSR()+" Building model definition  of joint module\n");
     591  //Std(BSR()+" Parsed "+r+" inequations \n");
     592  //Std(BSR()+" Building model definition  of joint module\n");
    593593    int result = checkDimensions(m);
    594594    if(result) { return(result); }
    … …  
    597597    for(i=0; i<noiseInfo_.size(); i++)
    598598    {
    599       Std(BSR()+" Building noise "+noiseInfo_[i].name.c_str()+"\n");
     599    //Std(BSR()+" Building noise "+noiseInfo_[i].name.c_str()+"\n");
    600600      if(expand2AllEqu_covAndFactors(noiseInfo_[i]))
    601601      {
    … …  
    604604    }
    605605    BVMat X_, A_;
    606     Std(BSR()+" Allocating dense output with "+m+" cells\n");
     606  //Std(BSR()+" Allocating dense output with "+m+" cells\n");
    607607    Y.BlasRDense(m,1);
    608     Std(BSR()+" Allocating triplet sparse input with "+Xnzmax_+" non null cells\n");
     608  //Std(BSR()+" Allocating triplet sparse input with "+Xnzmax_+" non null cells\n");
    609609    X_.ChlmRTriplet(m,n,Xnzmax_);
    610     Std(BSR()+" Allocating dense inequation border with "+r+" cells\n");
     610  //Std(BSR()+" Allocating dense inequation border with "+r+" cells\n");
    611611    a_.BlasRDense(r,1);
    612     Std(BSR()+" Allocating triplet sparse inequation coefficeints with "+Anzmax_+" cells\n");
     612  //Std(BSR()+" Allocating triplet sparse inequation coefficeints with "+Anzmax_+" cells\n");
    613613    A_.ChlmRTriplet(r,n,Anzmax_);
    614614    size_t& Xn = X_.s_.chlmRtriplet_->nnz;
    … …  
    624624    int oldRatio = 0;
    625625    Xn = 0;
    626     Std(BSR()+"Building regression "+m+" equations with "+n+" variables\n");
     626  //Std(BSR()+"Building regression "+m+" equations with "+n+" variables\n");
    627627    for(i=0; i<m; i++)
    628628    {
    … …  
    631631      {
    632632        oldRatio = ratio;
    633         Std(".");
     633      //Std(".");
    634634      }
    635635      lin_reg_equation& eq =equ_vec[i];
    … …  
    646646      }
    647647    }
    648     Std("\n");
    649     Std(BSR()+"Converting regression equations from triplet to sparse\n");
     648  //Std("\n");
     649  //Std(BSR()+"Converting regression equations from triplet to sparse\n");
    650650    X.Convert(X_,BVMat::ESC_chlmRsparse);
    651651    oldRatio = 0;
    652652    An = 0;
    653     Std(BSR()+"Building "+r+" constrain inequations with "+n+" variables\n");
     653  //Std(BSR()+"Building "+r+" constrain inequations with "+n+" variables\n");
    654654    for(i=0; i<r; i++)
    655655    {
    … …  
    658658      {
    659659        oldRatio = ratio;
    660         Std(".");
     660      //Std(".");
    661661      }
    662662      double sign = (ine_vec[i].isGE)?1.0:-1.0;
    … …  
    671671      }
    672672    }
    673     Std("\n");
    674     Std(BSR()+"Converting constrain inequations from triplet to sparse\n");
     673  //Std("\n");
     674  //Std(BSR()+"Converting constrain inequations from triplet to sparse\n");
    675675    A.Convert(A_,BVMat::ESC_chlmRsparse);
    676676    result = getMissing(Y,X,inputMissingInfo_, outputMissingInfo_);

  • tol/btol/vmatrix_type/vmat_bsr_primary.cpp

    rd2cf6f7 r66654ee  
    591591    int r = ine_vec.size();
    592592    if(!n && !X_.Rows()) { X_.BlasRDense(m,0); }
    593     Std(BSR()+" Building model definition of primary module\n");
     593  //Std(BSR()+" Building model definition of primary module\n");
    594594    int result = checkDimensions(m);
    595595    if(result) { return(result); }
    596596    linearInfo_  = var.vec;
    597597    noiseInfo_   = noise.vec;
    598     Std(BSR()+" Building noise "+noiseInfo_[0].name.c_str()+"\n");
     598  //Std(BSR()+" Building noise "+noiseInfo_[0].name.c_str()+"\n");
    599599    for(i=1; i<=m; i++)
    600600    {
    … …  
    625625      X = X_;
    626626      BVMat A_;
    627       Std(BSR()+" Allocating dense inequation border with "+r+" cells\n");
     627    //Std(BSR()+" Allocating dense inequation border with "+r+" cells\n");
    628628      a_.BlasRDense(r,1);
    629       Std(BSR()+" Allocating triplet sparse inequation coefficeints with "+Anzmax_+" cells\n");
     629    //Std(BSR()+" Allocating triplet sparse inequation coefficeints with "+Anzmax_+" cells\n");
    630630      A_.ChlmRTriplet(r,n,Anzmax_);
    631631      size_t& An = A_.s_.chlmRtriplet_->nnz;
    … …  
    636636      int oldRatio = 0;
    637637      An = 0;
    638       Std(BSR()+"Building "+r+"constrain inequations with "+n+" variables\n");
     638    //Std(BSR()+"Building "+r+"constrain inequations with "+n+" variables\n");
    639639      for(i=0; i<r; i++)
    640640      {
    … …  
    643643        {
    644644          oldRatio = ratio;
    645           Std(".");
     645        //Std(".");
    646646        }
    647647        double sign = (ine_vec[i].isGE)?1.0:-1.0;
    … …  
    656656        }
    657657      }
    658       Std("\n");
    659       Std(BSR()+"Converting constrain inequations from triplet to sparse\n");
     658    //Std("\n");
     659    //Std(BSR()+"Converting constrain inequations from triplet to sparse\n");
    660660      A.Convert(A_,BVMat::ESC_chlmRsparse);
    661661      result = getMissing(Y,X,inputMissingInfo_, outputMissingInfo_);
Note: See TracChangeset for help on using the changeset viewer.