Changeset 1534


Ignore:
Timestamp:
Sep 28, 2009 12:38:40 PM (11 years ago)
Author:
bradbell
Message:

trunk: Change vector_pack member variable to more specific name
(use generic name for paperameters that are either vector_pack or vector_set).

Location:
trunk/cppad/local
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/cppad/local/ad_fun.hpp

    r1532 r1534  
    9898        // results of the forward mode Jacobian sparsity calculations
    9999        // (n_set() for one of these two will always be zero)
    100         vector_pack      for_jac_sparsity_;
     100        vector_pack      for_jac_sparse_pack_;
    101101        vector_set       for_jac_sparse_set_;
    102102
     
    264264        size_t Memory(void) const
    265265        {       size_t pervar  = taylor_col_dim_ * sizeof(Base)
    266                 + for_jac_sparsity_.memory();
     266                + for_jac_sparse_pack_.memory()
     267                + for_jac_sparse_set_.memory();
    267268                size_t total   = total_num_var_ * pervar + play_.Memory();
    268269                return total;
  • trunk/cppad/local/dependent.hpp

    r1515 r1534  
    235235        if( taylor_ != CPPAD_NULL )
    236236                CPPAD_TRACK_DEL_VEC(taylor_);
    237         for_jac_sparsity_.resize(0, 0);
     237        for_jac_sparse_pack_.resize(0, 0);
     238        for_jac_sparse_set_.resize(0,0);
    238239
    239240        // initialize buffers
  • trunk/cppad/local/for_sparse_jac.hpp

    r1533 r1534  
    254254        {       // free any results stored in for_jac_sparse_set_       
    255255                for_jac_sparse_set_.resize(0, 0);
    256                 // store results in for_jac_sparsity_
     256                // store results in for_jac_sparse_pack_
    257257                CppAD::ForSparseJac(
    258258                        q                ,
     
    263263                        ind_taddr_       ,
    264264                        play_            ,
    265                         for_jac_sparsity_
     265                        for_jac_sparse_pack_
    266266                );
    267267        }
    268268        else
    269         {       // free any results stored in for_jac_sparsity_
    270                 for_jac_sparsity_.resize(0, 0);
     269        {       // free any results stored in for_jac_sparse_pack_
     270                for_jac_sparse_pack_.resize(0, 0);
    271271                // store results in for_jac_sparse_set_
    272272                CppAD::ForSparseJac(
  • trunk/cppad/local/optimize.hpp

    r1515 r1534  
    722722        // free memory allocated for sparse Jacobian calculation
    723723        // (the results are no longer valid)
    724         for_jac_sparsity_.resize(0, 0);
     724        for_jac_sparse_pack_.resize(0, 0);
     725        for_jac_sparse_set_.resize(0,0);
    725726
    726727        // free old Taylor coefficient memory
  • trunk/cppad/local/rev_sparse_hes.hpp

    r1533 r1534  
    303303        VectorBool h( n * q );
    304304
    305         if( for_jac_sparsity_.n_set() > 0 )
     305        if( for_jac_sparse_pack_.n_set() > 0 )
    306306        {       CPPAD_ASSERT_UNKNOWN( for_jac_sparse_set_.n_set() == 0 );
    307307                // use vector_pack for the calculation
     
    314314                        ind_taddr_        ,
    315315                        play_             ,
    316                         for_jac_sparsity_
     316                        for_jac_sparse_pack_
    317317                );
    318318        }
    319319        else
    320         {       CPPAD_ASSERT_UNKNOWN( for_jac_sparsity_.n_set() == 0 );
     320        {       CPPAD_ASSERT_UNKNOWN( for_jac_sparse_pack_.n_set() == 0 );
    321321                // use vector_pack for the calculation
    322322                CppAD::RevSparseHes(
Note: See TracChangeset for help on using the changeset viewer.