comparison liboctave/Array.cc @ 4827:bb82599f039f

[project @ 2004-03-09 20:50:18 by jwe]
author jwe
date Tue, 09 Mar 2004 20:50:18 +0000
parents d0aa1a59b73b
children e78bc84ac0d3
comparison
equal deleted inserted replaced
4826:a7b1e6122d0c 4827:bb82599f039f
2000 2000
2001 Array<T> tmp = index1 (idx_arg, resize_ok); 2001 Array<T> tmp = index1 (idx_arg, resize_ok);
2002 2002
2003 int len = tmp.length (); 2003 int len = tmp.length ();
2004 2004
2005 if (len == 0) 2005 if ((len != 0 && idx_arg.one_zero_only ())
2006 { 2006 || idx_orig_rows == 1 || idx_orig_columns == 1)
2007 if (idx_orig_rows == 0 || idx_orig_columns == 0) 2007 {
2008 retval = Array<T> (dim_vector (idx_orig_rows, idx_orig_columns)); 2008 if (nr == 1)
2009 else if (nr == 1) 2009 retval = Array<T> (tmp, dim_vector (1, len));
2010 retval = Array<T> (dim_vector (1, 0));
2011 else 2010 else
2012 retval = Array<T> (dim_vector (0, 1)); 2011 retval = Array<T> (tmp, dim_vector (len, 1));
2013 } 2012 }
2014 else 2013 else
2015 { 2014 retval = Array<T> (tmp, dim_vector (idx_orig_rows, idx_orig_columns));
2016 if (idx_arg.one_zero_only ()
2017 || idx_orig_rows == 1 || idx_orig_columns == 1)
2018 {
2019 if (nr == 1)
2020 retval = Array<T> (tmp, dim_vector (1, len));
2021 else
2022 retval = Array<T> (tmp, dim_vector (len, 1));
2023 }
2024 else
2025 retval = Array<T> (tmp, dim_vector (idx_orig_rows, idx_orig_columns));
2026 }
2027 } 2015 }
2028 else 2016 else
2029 { 2017 {
2030 if (liboctave_wfi_flag 2018 if (liboctave_wfi_flag
2031 && ! (idx_arg.one_zero_only () 2019 && ! (idx_arg.one_zero_only ()