Changeset 114


Ignore:
Timestamp:
Jul 19, 2010 12:11:08 PM (10 years ago)
Author:
awalther
Message:

updated ColPack? interface

File:
1 edited

Legend:

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

    r106 r114  
    117117  int dummy;
    118118
    119   BipartiteGraphPartialColoringInterface *g = new BipartiteGraphPartialColoringInterface;
     119  BipartiteGraphPartialColoringInterface *g = new BipartiteGraphPartialColoringInterface(SRC_MEM_ADOLC,JP,m,n);
    120120
    121121  if (option == 1)
    122122    g->GenerateSeedJacobian(JP, m, n, Seed, p, &dummy,
    123                             "LEFT_PARTIAL_DISTANCE_TWO", "SMALLEST_LAST");
     123                                "SMALLEST_LAST","ROW_PARTIAL_DISTANCE_TWO");
    124124  else
    125125    g->GenerateSeedJacobian(JP, m, n, Seed, &dummy, p,
    126                             "RIGHT_PARTIAL_DISTANCE_TWO", "SMALLEST_LAST");
     126                                "SMALLEST_LAST","COLUMN_PARTIAL_DISTANCE_TWO");
    127127}
    128128#else
     
    191191  int dummy;
    192192
    193   GraphColoringInterface *g = new GraphColoringInterface;
     193  GraphColoringInterface *g = new GraphColoringInterface(SRC_WAIT);
    194194
    195195  if (option == 0)
    196196    g->GenerateSeedHessian(HP, n, Seed, &dummy, p,
    197                                  "ACYCLIC_FOR_INDIRECT_RECOVERY", "NATURAL");
     197                           "SMALLEST_LAST","ACYCLIC_FOR_INDIRECT_RECOVERY");
    198198  else
    199199    g->GenerateSeedHessian(HP, n, Seed, &dummy, p,
    200                            "STAR", "SMALLEST_LAST");
     200                           "SMALLEST_LAST","STAR");
    201201
    202202}
     
    295295      FILE *fp_JP;
    296296                       
    297       g = new BipartiteGraphPartialColoringInterface;
     297      g = new BipartiteGraphPartialColoringInterface(SRC_WAIT);
    298298      jr1d = new JacobianRecovery1D;
    299299       
    300300      if (options[3] == 1)
    301301        g->GenerateSeedJacobian(sJinfos.JP, depen, indep, &(sJinfos.Seed), &(sJinfos.p), &dummy,
    302                                 "LEFT_PARTIAL_DISTANCE_TWO", "SMALLEST_LAST");
     302                                "SMALLEST_LAST","ROW_PARTIAL_DISTANCE_TWO");
    303303      else
    304304        g->GenerateSeedJacobian(sJinfos.JP, depen, indep, &(sJinfos.Seed), &dummy, &(sJinfos.p),
    305                                 "RIGHT_PARTIAL_DISTANCE_TWO", "SMALLEST_LAST");
     305                                "SMALLEST_LAST","COLUMN_PARTIAL_DISTANCE_TWO");
    306306     
    307307      if (options[3] == 1)
     
    358358 
    359359      if (options[3] == 1)
    360        jr1d->RecoverForPD2RowWise_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
     360       jr1d->RecoverD2Row_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
    361361     else
    362        jr1d->RecoverForPD2ColumnWise_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
     362       jr1d->RecoverD2Cln_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
    363363
    364364    return ret_val;
     
    451451        Seed = NULL;
    452452
    453         g = new GraphColoringInterface;
     453        g = new GraphColoringInterface(SRC_WAIT);
    454454        hr = new HessianRecovery;
    455455
    456456        if (options[1] == 0)
    457457          g->GenerateSeedHessian(sHinfos.HP, indep, &Seed, &dummy, &sHinfos.p,
    458                                  "ACYCLIC_FOR_INDIRECT_RECOVERY", "NATURAL");
     458                                 "SMALLEST_LAST","ACYCLIC_FOR_INDIRECT_RECOVERY");
    459459        else
    460460          g->GenerateSeedHessian(sHinfos.HP, indep, &Seed, &dummy, &sHinfos.p,
    461                                  "STAR", "SMALLEST_LAST");
     461                                 "SMALLEST_LAST","STAR");
    462462
    463463       
Note: See TracChangeset for help on using the changeset viewer.