Mercurial > hg > octave-lyh

comparison src/data.cc @ 2305:5a3f1d00a474

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1996-07-09 16:20:40 by jwe]
author jwe
date Tue, 09 Jul 1996 16:20:40 +0000
parents 6abec42e52f6
children c90105b99479
comparison
equal deleted inserted replaced
2304:532542bd9493 2305:5a3f1d00a474
105 105
106 Matrix retval (nr, nc); 106 Matrix retval (nr, nc);
107 107
108 for (int j = 0; j < nc; j++) 108 for (int j = 0; j < nc; j++)
109 for (int i = 0; i < nr; i++) 109 for (int i = 0; i < nr; i++)
110 retval.elem (i, j) = f (x, y.elem (i, j)); 110 retval (i, j) = f (x, y (i, j));
111 111
112 return retval; 112 return retval;
113 } 113 }
114 114
115 static Matrix 115 static Matrix
120 120
121 Matrix retval (nr, nc); 121 Matrix retval (nr, nc);
122 122
123 for (int j = 0; j < nc; j++) 123 for (int j = 0; j < nc; j++)
124 for (int i = 0; i < nr; i++) 124 for (int i = 0; i < nr; i++)
125 retval.elem (i, j) = f (x.elem (i, j), y); 125 retval (i, j) = f (x (i, j), y);
126 126
127 return retval; 127 return retval;
128 } 128 }
129 129
130 static Matrix 130 static Matrix
140 140
141 Matrix retval (x_nr, x_nc); 141 Matrix retval (x_nr, x_nc);
142 142
143 for (int j = 0; j < x_nc; j++) 143 for (int j = 0; j < x_nc; j++)
144 for (int i = 0; i < x_nr; i++) 144 for (int i = 0; i < x_nr; i++)
145 retval.elem (i, j) = f (x.elem (i, j), y.elem (i, j)); 145 retval (i, j) = f (x (i, j), y (i, j));
146 146
147 return retval; 147 return retval;
148 } 148 }
149 149
150 DEFUN (atan2, args, , 150 DEFUN (atan2, args, ,
332 if (nr == 1) 332 if (nr == 1)
333 { 333 {
334 int n = nc + ABS (k); 334 int n = nc + ABS (k);
335 Matrix m (n, n, 0.0); 335 Matrix m (n, n, 0.0);
336 for (int i = 0; i < nc; i++) 336 for (int i = 0; i < nc; i++)
337 m.elem (i+roff, i+coff) = v.elem (0, i); 337 m (i+roff, i+coff) = v (0, i);
338 retval = octave_value (m); 338 retval = octave_value (m);
339 } 339 }
340 else 340 else
341 { 341 {
342 int n = nr + ABS (k); 342 int n = nr + ABS (k);
343 Matrix m (n, n, 0.0); 343 Matrix m (n, n, 0.0);
344 for (int i = 0; i < nr; i++) 344 for (int i = 0; i < nr; i++)
345 m.elem (i+roff, i+coff) = v.elem (i, 0); 345 m (i+roff, i+coff) = v (i, 0);
346 retval = octave_value (m); 346 retval = octave_value (m);
347 } 347 }
348 348
349 return retval; 349 return retval;
350 } 350 }
374 if (nr == 1) 374 if (nr == 1)
375 { 375 {
376 int n = nc + ABS (k); 376 int n = nc + ABS (k);
377 ComplexMatrix m (n, n, 0.0); 377 ComplexMatrix m (n, n, 0.0);
378 for (int i = 0; i < nc; i++) 378 for (int i = 0; i < nc; i++)
379 m.elem (i+roff, i+coff) = v.elem (0, i); 379 m (i+roff, i+coff) = v (0, i);
380 retval = octave_value (m); 380 retval = octave_value (m);
381 } 381 }
382 else 382 else
383 { 383 {
384 int n = nr + ABS (k); 384 int n = nr + ABS (k);
385 ComplexMatrix m (n, n, 0.0); 385 ComplexMatrix m (n, n, 0.0);
386 for (int i = 0; i < nr; i++) 386 for (int i = 0; i < nr; i++)
387 m.elem (i+roff, i+coff) = v.elem (i, 0); 387 m (i+roff, i+coff) = v (i, 0);
388 retval = octave_value (m); 388 retval = octave_value (m);
389 } 389 }
390 390
391 return retval; 391 return retval;
392 } 392 }
473 if (k == 0) 473 if (k == 0)
474 retval = d; 474 retval = d;
475 else if (k > 0) 475 else if (k > 0)
476 { 476 {
477 Matrix m (n, n, 0.0); 477 Matrix m (n, n, 0.0);
478 m.elem (0, k) = d; 478 m (0, k) = d;
479 retval = m; 479 retval = m;
480 } 480 }
481 else if (k < 0) 481 else if (k < 0)
482 { 482 {
483 Matrix m (n, n, 0.0); 483 Matrix m (n, n, 0.0);
484 m.elem (-k, 0) = d; 484 m (-k, 0) = d;
485 retval = m; 485 retval = m;
486 } 486 }
487 } 487 }
488 else if (a.is_matrix_type ()) 488 else if (a.is_matrix_type ())
489 { 489 {
514 if (k == 0) 514 if (k == 0)
515 retval = c; 515 retval = c;
516 else if (k > 0) 516 else if (k > 0)
517 { 517 {
518 ComplexMatrix m (n, n, 0.0); 518 ComplexMatrix m (n, n, 0.0);
519 m.elem (0, k) = c; 519 m (0, k) = c;
520 retval = m; 520 retval = m;
521 } 521 }
522 else if (k < 0) 522 else if (k < 0)
523 { 523 {
524 ComplexMatrix m (n, n, 0.0); 524 ComplexMatrix m (n, n, 0.0);
525 m.elem (-k, 0) = c; 525 m (-k, 0) = c;
526 retval = m; 526 retval = m;
527 } 527 }
528 } 528 }
529 else if (a.is_matrix_type ()) 529 else if (a.is_matrix_type ())
530 { 530 {
624 int nc = args(0).columns (); 624 int nc = args(0).columns ();
625 625
626 if (nargout == 0 || nargout == 1) 626 if (nargout == 0 || nargout == 1)
627 { 627 {
628 Matrix m (1, 2); 628 Matrix m (1, 2);
629 m.elem (0, 0) = nr; 629 m (0, 0) = nr;
630 m.elem (0, 1) = nc; 630 m (0, 1) = nc;
631 retval = m; 631 retval = m;
632 } 632 }
633 else if (nargout == 2) 633 else if (nargout == 2)
634 { 634 {
635 retval(1) = (double) nc; 635 retval(1) = (double) nc;
843 ColumnVector v = a.vector_value (); 843 ColumnVector v = a.vector_value ();
844 844
845 if (error_state) 845 if (error_state)
846 return; 846 return;
847 847
848 nr = NINT (v.elem (0)); 848 nr = NINT (v (0));
849 nc = NINT (v.elem (1)); 849 nc = NINT (v (1));
850 } 850 }
851 else 851 else
852 warning ("%s (A): use %s (size (A)) instead", warn_for, warn_for); 852 warning ("%s (A): use %s (size (A)) instead", warn_for, warn_for);
853 } 853 }
854 854
968 968
969 if (nr > 0 && nc > 0) 969 if (nr > 0 && nc > 0)
970 { 970 {
971 int n = MIN (nr, nc); 971 int n = MIN (nr, nc);
972 for (int i = 0; i < n; i++) 972 for (int i = 0; i < n; i++)
973 m.elem (i, i) = 1.0; 973 m (i, i) = 1.0;
974 } 974 }
975 975
976 return m; 976 return m;
977 } 977 }
978 978
989 989
990 if (nr > 0 && nc > 0) 990 if (nr > 0 && nc > 0)
991 { 991 {
992 int n = MIN (nr, nc); 992 int n = MIN (nr, nc);
993 for (int i = 0; i < n; i++) 993 for (int i = 0; i < n; i++)
994 m.elem (i, i) = 1.0; 994 m (i, i) = 1.0;
995 } 995 }
996 996
997 return m; 997 return m;
998 } 998 }
999 999