/[ascend]/trunk/base/generic/solver/slv3.c
ViewVC logotype

Diff of /trunk/base/generic/solver/slv3.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 920 by johnpye, Thu Nov 2 21:34:59 2006 UTC revision 921 by johnpye, Mon Nov 6 07:49:06 2006 UTC
# Line 862  static void calc_relnoms(slv3_system_t s Line 862  static void calc_relnoms(slv3_system_t s
862    struct rel_relation *rel;    struct rel_relation *rel;
863    real64 *var_list;    real64 *var_list;
864    
865    CONSOLE_DEBUG("Begin 'calc_relnoms'");    /* CONSOLE_DEBUG("Begin 'calc_relnoms'"); */
866    
867    var_list = ASC_NEW_ARRAY_OR_NULL(real64,sys->cap);    var_list = ASC_NEW_ARRAY_OR_NULL(real64,sys->cap);
868    col = 0;    col = 0;
# Line 893  static void calc_relnoms(slv3_system_t s Line 893  static void calc_relnoms(slv3_system_t s
893    }    }
894    destroy_array(var_list);    destroy_array(var_list);
895    
896    CONSOLE_DEBUG("End 'calc_relnoms'");    /* CONSOLE_DEBUG("End 'calc_relnoms'"); */
897  }  }
898    
899    
# Line 3724  static void slv3_iterate(slv_system_t se Line 3724  static void slv3_iterate(slv_system_t se
3724    int               minor = 0,ds_status=0, rank_defect=0;    int               minor = 0,ds_status=0, rank_defect=0;
3725    double            time0;    double            time0;
3726    
3727    CONSOLE_DEBUG("Begin 'slv3_iterate'");    /* CONSOLE_DEBUG("Begin 'slv3_iterate'"); */
3728    sys = SLV3(asys);    sys = SLV3(asys);
3729    mif = MIF(sys);    mif = MIF(sys);
3730    lif = LIF(sys);    lif = LIF(sys);
# Line 3782  static void slv3_iterate(slv_system_t se Line 3782  static void slv3_iterate(slv_system_t se
3782      }      }
3783    
3784      /* Attempt direct solve */      /* Attempt direct solve */
3785      CONSOLE_DEBUG("Attempting direct solve...");      /* CONSOLE_DEBUG("Attempting direct solve..."); */
3786      time0=tm_cpu_time();      time0=tm_cpu_time();
3787      ds_status=slv_direct_solve(SERVER,rel,var,mif,FEAS_TOL,      ds_status=slv_direct_solve(SERVER,rel,var,mif,FEAS_TOL,
3788                                 IGNORE_BOUNDS,0);                                 IGNORE_BOUNDS,0);
# Line 3830  static void slv3_iterate(slv_system_t se Line 3830  static void slv3_iterate(slv_system_t se
3830      error_reporter_end_flush();      error_reporter_end_flush();
3831    }    }
3832    
3833    CONSOLE_DEBUG("Scale system...");    /* CONSOLE_DEBUG("Scale system..."); */
3834    
3835    scale_system(sys);    scale_system(sys);
3836    
# Line 3883  static void slv3_iterate(slv_system_t se Line 3883  static void slv3_iterate(slv_system_t se
3883      return;      return;
3884    }    }
3885    
3886    CONSOLE_DEBUG("calc_newton...");    /* CONSOLE_DEBUG("calc_newton..."); */
3887    
3888    calc_newton(sys);    calc_newton(sys);
3889    
# Line 4091  static void slv3_iterate(slv_system_t se Line 4091  static void slv3_iterate(slv_system_t se
4091        FPRINTF(stderr,"***********************************\n");        FPRINTF(stderr,"***********************************\n");
4092  #endif  #endif
4093    
4094    CONSOLE_DEBUG("Iteration ends...");    /* CONSOLE_DEBUG("Iteration ends..."); */
4095    
4096    iteration_ends(sys);    iteration_ends(sys);
4097    if( !OPTIMIZING(sys) && block_feasible(sys) )  {    if( !OPTIMIZING(sys) && block_feasible(sys) )  {

Legend:
Removed from v.920  
changed lines
  Added in v.921

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22