[BACK]Return to ca.h CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / include

Diff for /OpenXM_contrib2/asir2000/include/ca.h between version 1.39 and 1.42

version 1.39, 2003/11/08 01:12:03 version 1.42, 2004/02/03 23:31:58
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.38 2003/10/20 07:18:42 saito Exp $   * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.41 2003/12/23 10:39:57 ohara Exp $
 */  */
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
Line 491  struct order_pair {
Line 491  struct order_pair {
         int order, length;          int order, length;
 };  };
   
   struct sparse_weight {
           int pos, value;
   };
   
   #define IS_DENSE_WEIGHT 0
   #define IS_SPARSE_WEIGHT 1
   #define IS_BLOCK 2
   
   struct weight_or_block {
           int type;
           int length;
           union {
                   int *dense_weight;
                   struct sparse_weight *sparse_weight;
                   struct {
                           int order, start;
                   } block;
           } body;
   };
   
 struct order_spec {  struct order_spec {
         int id;          int id;
         Obj obj;          Obj obj;
Line 505  struct order_spec {
Line 525  struct order_spec {
                         int row;                          int row;
                         int **matrix;                          int **matrix;
                 } matrix;                  } matrix;
                   struct {
                           int length;
                           struct weight_or_block *w_or_b;
                   } composite;
         } ord;          } ord;
 };  };
   
Line 590  typedef unsigned int ModNum;
Line 614  typedef unsigned int ModNum;
 #endif  #endif
   
 /* for setjmp/longjmp compatibility */  /* for setjmp/longjmp compatibility */
 #if defined(__CYGWIN__)  #if defined(__CYGWIN__) || defined(__x86_64)
 #define JMP_BUF sigjmp_buf  #define JMP_BUF sigjmp_buf
 #define SETJMP(x) sigsetjmp(x,~0)  #define SETJMP(x) sigsetjmp(x,~0)
 #define LONGJMP(x,y) siglongjmp(x,y)  #define LONGJMP(x,y) siglongjmp(x,y)
Line 1446  void dtestroot(int,int,P,LUM,struct oDUM *,DCP *);
Line 1470  void dtestroot(int,int,P,LUM,struct oDUM *,DCP *);
 void dtestroot1(int,int,P,LUM,P *);  void dtestroot1(int,int,P,LUM,P *);
 void dtestsq(int,int,P,LUM,P *);  void dtestsq(int,int,P,LUM,P *);
 void dtestsql(P,ML,struct oDUM *,DCP *);  void dtestsql(P,ML,struct oDUM *,DCP *);
   void ediffp(VL,P,V,P *);
 void estimatelc(VL,Q,DCP,VN,P *);  void estimatelc(VL,Q,DCP,VN,P *);
 void eucum(register int,UM,UM,UM,UM);  void eucum(register int,UM,UM,UM,UM);
 void exthp(VL,P,int,P *);  void exthp(VL,P,int,P *);
Legend:
Removed from v.1.39  
changed lines
  Added in v.1.42
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>