Mercurial > octave-nkf

comparison src/OPERATORS/op-int.h @ 8679:280fae940bb0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
optimize scalar indexing
author Jaroslav Hajek <highegg@gmail.com>
date Thu, 05 Feb 2009 13:58:11 +0100
parents 283989f2da9b
children eb63fbe60fab
comparison
equal deleted inserted replaced
8678:e2b4c19c455c 8679:280fae940bb0
576 #define OCTAVE_MS_INT_BOOL_OPS(PFX, TM, TS) \ 576 #define OCTAVE_MS_INT_BOOL_OPS(PFX, TM, TS) \
577 DEFNDBINOP_FN (PFX ## _el_and, TM ## matrix, TS ## scalar, TM ## array, TS ## scalar, mx_el_and) \ 577 DEFNDBINOP_FN (PFX ## _el_and, TM ## matrix, TS ## scalar, TM ## array, TS ## scalar, mx_el_and) \
578 DEFNDBINOP_FN (PFX ## _el_or, TM ## matrix, TS ## scalar, TM ## array, TS ## scalar, mx_el_or) 578 DEFNDBINOP_FN (PFX ## _el_or, TM ## matrix, TS ## scalar, TM ## array, TS ## scalar, mx_el_or)
579 579
580 #define OCTAVE_MS_INT_ASSIGN_OPS(PFX, TM, TS, TE) \ 580 #define OCTAVE_MS_INT_ASSIGN_OPS(PFX, TM, TS, TE) \
581 DEFNDASSIGNOP_FN (PFX ## _assign, TM ## matrix, TS ## scalar, TE ## array, assign) 581 DEFNDASSIGNOP_FN (PFX ## _assign, TM ## matrix, TS ## scalar, TM ## scalar, assign)
582 582
583 #define OCTAVE_MS_POW_OPS(T1, T2) \ 583 #define OCTAVE_MS_POW_OPS(T1, T2) \
584 octave_value elem_xpow (T1 ## NDArray a, octave_ ## T2 b) \ 584 octave_value elem_xpow (T1 ## NDArray a, octave_ ## T2 b) \
585 { \ 585 { \
586 T1 ## NDArray result (a.dims ()); \ 586 T1 ## NDArray result (a.dims ()); \
735 #define OCTAVE_MM_INT_BOOL_OPS(PFX, T1, T2) \ 735 #define OCTAVE_MM_INT_BOOL_OPS(PFX, T1, T2) \
736 DEFNDBINOP_FN (PFX ## _el_and, T1 ## matrix, T2 ## matrix, T1 ## array, T2 ## array, mx_el_and) \ 736 DEFNDBINOP_FN (PFX ## _el_and, T1 ## matrix, T2 ## matrix, T1 ## array, T2 ## array, mx_el_and) \
737 DEFNDBINOP_FN (PFX ## _el_or, T1 ## matrix, T2 ## matrix, T1 ## array, T2 ## array, mx_el_or) 737 DEFNDBINOP_FN (PFX ## _el_or, T1 ## matrix, T2 ## matrix, T1 ## array, T2 ## array, mx_el_or)
738 738
739 #define OCTAVE_MM_INT_ASSIGN_OPS(PFX, TLHS, TRHS, TE) \ 739 #define OCTAVE_MM_INT_ASSIGN_OPS(PFX, TLHS, TRHS, TE) \
740 DEFNDASSIGNOP_FN (PFX ## _assign, TLHS ## matrix, TRHS ## matrix, TE ## array, assign) 740 DEFNDASSIGNOP_FN (PFX ## _assign, TLHS ## matrix, TRHS ## matrix, TLHS ## array, assign)
741 741
742 #define OCTAVE_MM_POW_OPS(T1, T2) \ 742 #define OCTAVE_MM_POW_OPS(T1, T2) \
743 octave_value \ 743 octave_value \
744 elem_xpow (const T1 ## NDArray& a, const T2 ## NDArray& b) \ 744 elem_xpow (const T1 ## NDArray& a, const T2 ## NDArray& b) \
745 { \ 745 { \