Changeset 65


Ignore:
Timestamp:
Dec 10, 2009 8:40:18 AM (10 years ago)
Author:
awalther
Message:

adaption to new ColPack? version

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ADOL-C/src/sparse/sparsedrivers.cpp

    r59 r65  
    222222    BipartiteGraphPartialColoringInterface *g;
    223223    TapeInfos *tapeInfos;
     224    JacobianRecovery1D jr1d;
    224225
    225226    ADOLC_OPENMP_THREAD_NUMBER;
     
    327328    /* recover compressed Jacobian => ColPack library */
    328329
    329     if (options[3] == 1)
    330       JacobianRecovery1D::RecoverForPD2RowWise_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
     330//     if (options[3] == 1)
     331//       JacobianRecovery1D::RecoverForPD2RowWise_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
     332//     else
     333//       JacobianRecovery1D::RecoverForPD2ColumnWise_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
     334//
     335     if (options[3] == 1)
     336      jr1d.RecoverForPD2RowWise_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
    331337    else
    332       JacobianRecovery1D::RecoverForPD2ColumnWise_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
     338      jr1d.RecoverForPD2ColumnWise_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
    333339   
    334340    return ret_val;
     
    369375    TapeInfos *tapeInfos;
    370376    double *v, *w, **X, yt, lag=1;
     377    HessianRecovery hr;
    371378
    372379    ADOLC_OPENMP_THREAD_NUMBER;
     
    422429                                 "STAR", "SMALLEST_LAST");
    423430
     431       
    424432        sHinfos.Hcomp = myalloc2(indep,sHinfos.p);
    425433        sHinfos.Xppp = myalloc3(indep,sHinfos.p,1);
     
    429437            sHinfos.Xppp[i][l][0] = Seed[i][l];
    430438
    431         delete[] Seed;
     439        for (i=0; i<indep; i++)
     440          delete Seed[i];
     441
     442        delete Seed;
    432443        Seed = NULL;
    433444
     
    514525    /* recover compressed Hessian => ColPack library */
    515526
     527//     if (options[1] == 0)
     528//       HessianRecovery::IndirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
     529//     else
     530//       HessianRecovery::DirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
     531 
    516532    if (options[1] == 0)
    517       HessianRecovery::IndirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
     533      hr.IndirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
    518534    else
    519       HessianRecovery::DirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
     535      hr.DirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
    520536 
    521537    return ret_val;
  • trunk/configure

    r61 r65  
    11#! /bin/sh
    2 # From configure.ac Revision: 57 .
     2# From configure.ac Revision: 61 .
    33# Guess values for system-dependent variables and create Makefiles.
    44# Generated by GNU Autoconf 2.61 for adolc 2.1.1-trunk.
Note: See TracChangeset for help on using the changeset viewer.