octave-nkf: src/ov-cell.cc comparison

comparison src/ov-cell.cc @ 5275:23b37da9fd5b

[project @ 2005-04-08 16:07:35 by jwe]

author	jwe
date	Fri, 08 Apr 2005 16:07:37 +0000
parents	57077d0ddc8e
children	4c8a2e4e0717

comparison

equal deleted inserted replaced

-:eae7b40388e9
+:23b37da9fd5b
 	    if (tcell.length () == 1)
 	      retval(0) = tcell(0,0);
 	    else
 	      {
-		int n = tcell.numel ();
+		octave_idx_type n = tcell.numel ();
 		octave_value_list lst (n, octave_value ());
-		for (int i = 0; i < n; i++)
+		for (octave_idx_type i = 0; i < n; i++)
 		  {
 		    OCTAVE_QUIT;
 		    lst(i) = tcell(i);
 		  }
 size_t
 octave_cell::byte_size (void) const
 {
 size_t retval = 0;
-for (int i = 0; i < numel (); i++)
+for (octave_idx_type i = 0; i < numel (); i++)
 retval += matrix(i).byte_size ();
 return retval;
 }
 octave_value_list
 octave_cell::list_value (void) const
 {
 octave_value_list retval;
-int nr = rows ();
+octave_idx_type nr = rows ();
-int nc = columns ();
+octave_idx_type nc = columns ();
 if (nr == 1 && nc > 0)
 {
 retval.resize (nc);
-for (int i = 0; i < nc; i++)
+for (octave_idx_type i = 0; i < nc; i++)
 	retval(i) = matrix(0,i);
 }
 else if (nc == 1 && nr > 0)
 {
 retval.resize (nr);
-for (int i = 0; i < nr; i++)
+for (octave_idx_type i = 0; i < nr; i++)
 	retval(i) = matrix(i,0);
 }
 else
 error ("invalid conversion from cell array to list");
 string_vector
 octave_cell::all_strings (bool pad, bool) const
 {
 string_vector retval;
-int nr = rows ();
+octave_idx_type nr = rows ();
-int nc = columns ();
+octave_idx_type nc = columns ();
 int n_elts = 0;
-int max_len = 0;
+octave_idx_type max_len = 0;
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
 {
-for (int i = 0; i < nr; i++)
+for (octave_idx_type i = 0; i < nr; i++)
 	{
 	  string_vector s = matrix(i,j).all_strings ();
 	  if (error_state)
 	    return retval;
 	  n_elts += s.length ();
-	  int s_max_len = s.max_length ();
+	  octave_idx_type s_max_len = s.max_length ();
 	  if (s_max_len > max_len)
 	    max_len = s_max_len;
 	}
 }
 retval.resize (n_elts);
-int k = 0;
+octave_idx_type k = 0;
-for (int j = 0; j < nc; j++)
+for (octave_idx_type j = 0; j < nc; j++)
 {
-for (int i = 0; i < nr; i++)
+for (octave_idx_type i = 0; i < nr; i++)
 	{
 	  string_vector s = matrix(i,j).all_strings ();
 	  int n = s.length ();
-	  for (int ii = 0; ii < n; ii++)
+	  for (octave_idx_type ii = 0; ii < n; ii++)
 	    {
 	      std::string t = s[ii];
 	      int t_len = t.length ();
 	      if (pad && max_len > t_len)
 {
 int nd = matrix.ndims ();
 if (nd == 2)
 {
-int nr = rows ();
+octave_idx_type nr = rows ();
-int nc = columns ();
+octave_idx_type nc = columns ();
 if (nr > 0 && nc > 0)
 	{
 	  indent (os);
 	  os << "{";
 	  newline (os);
 	  increment_indent_level ();
-	  for (int j = 0; j < nc; j++)
+	  for (octave_idx_type j = 0; j < nc; j++)
 	    {
-	      for (int i = 0; i < nr; i++)
+	      for (octave_idx_type i = 0; i < nr; i++)
 		{
 		  OCTAVE_QUIT;
 		  OSSTREAM buf;
 		  buf << "[" << i+1 << "," << j+1 << "]" << OSSTREAM_ENDS;
 dim_vector d = dims ();
 if (d.length () > 2)
 {
 os << "# ndims: " << d.length () << "\n";
-for (int i=0; i < d.length (); i++)
+for (int i = 0; i < d.length (); i++)
 	os << " " << d (i);
 os << "\n";
 Cell tmp = cell_value ();
-for (int i = 0; i < d.numel (); i++)
+for (octave_idx_type i = 0; i < d.numel (); i++)
 	{
 	  octave_value o_val = tmp.elem (i);
 	  // Recurse to print sub-value.
 	  bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, infnan_warned,
 os << "# rows: " << rows () << "\n"
 	 << "# columns: " << columns () << "\n";
 Cell tmp = cell_value ();
-for (int j = 0; j < tmp.cols (); j++)
+for (octave_idx_type j = 0; j < tmp.cols (); j++)
 	{
-	  for (int i = 0; i < tmp.rows (); i++)
+	  for (octave_idx_type i = 0; i < tmp.rows (); i++)
 	    {
 	      octave_value o_val = tmp.elem (i, j);
 	      // Recurse to print sub-value.
 	      bool b = save_ascii_data (os, o_val, CELL_ELT_TAG,
 keywords[0] = "ndims";
 keywords[1] = "rows";
 std::string kw;
-int val = 0;
+octave_idx_type val = 0;
 if (extract_keyword (is, keywords, kw, val, true))
 {
 if (kw == "ndims")
 	{
-	  int mdims = val;
+	  int mdims = static_cast<int> (val);
 	  if (mdims >= 0)
 	    {
 	      dim_vector dv;
 	      dv.resize (mdims);
 	      for (int i = 0; i < mdims; i++)
 		is >> dv(i);
 	      Cell tmp(dv);
-	      for (int i = 0; i < dv.numel (); i++)
+	      for (octave_idx_type i = 0; i < dv.numel (); i++)
 		{
 		  octave_value t2;
 		  bool dummy;
 		  // recurse to read cell elements
 	      success = false;
 	    }
 	}
 else if (kw == "rows")
 	{
-	  int nr = val;
+	  octave_idx_type nr = val;
-	  int nc = 0;
+	  octave_idx_type nc = 0;
 	  if (nr >= 0 && extract_keyword (is, "columns", nc) && nc >= 0)
 	    {
 	      if (nr > 0 && nc > 0)
 		{
 		  Cell tmp (nr, nc);
-		  for (int j = 0; j < nc; j++)
+		  for (octave_idx_type j = 0; j < nc; j++)
 		    {
-		      for (int i = 0; i < nr; i++)
+		      for (octave_idx_type i = 0; i < nr; i++)
 			{
 			  octave_value t2;
 			  bool dummy;
 			  // recurse to read cell elements
 return false;
 // Use negative value for ndims
 FOUR_BYTE_INT di = - d.length();
 os.write (X_CAST (char *, &di), 4);
-for (int i=0; i < d.length (); i++)
+for (int i = 0; i < d.length (); i++)
 {
 di = d(i);
 os.write (X_CAST (char *, &di), 4);
 }
 Cell tmp = cell_value ();
-for (int i = 0; i < d.numel (); i++)
+for (octave_idx_type i = 0; i < d.numel (); i++)
 {
 octave_value o_val = tmp.elem (i);
 // Recurse to print sub-value.
 bool b = save_binary_data (os, o_val, CELL_ELT_TAG, "", 0,
 dv.resize (mdims);
 dv(1) = dv(0);
 dv(0) = 1;
 }
-int nel = dv.numel ();
+octave_idx_type nel = dv.numel ();
 Cell tmp(dv);
-for (int i = 0; i < nel; i++)
+for (octave_idx_type i = 0; i < nel; i++)
 {
 octave_value t2;
 bool dummy;
 std::string doc;
 // Recursively add each element of the cell to this group.
 Cell tmp = cell_value ();
-for (int i = 0; i < dv.numel (); i++)
+for (octave_idx_type i = 0; i < dv.numel (); i++)
 {
 char s[20];
 sprintf (s, "_%d", i);
 if (! add_hdf5_data(data_hid, tmp.elem (i), s, "", false,
 group_id = H5Gopen (loc_id, name);
 H5Gget_num_objs (group_id, &num_obj);
 H5Gclose (group_id);
 #endif
-for (int i = 0; i < dv.numel (); i++)
+for (octave_idx_type i = 0; i < dv.numel (); i++)
 {
 #ifdef HAVE_H5GGET_NUM_OBJS
 if (current_item >= static_cast<int> (num_obj))
 	retval2 = -1;
 	{
 	  dim_vector m_dv = m.dims ();
 	  string_vector keys = m.keys ();
-	  int fields_numel = keys.length ();
+	  octave_idx_type fields_numel = keys.length ();
 	  // The resulting dim_vector should have dimensions:
 	  // [numel(fields) size(struct)]
 	  dim_vector result_dv;
 	  // Use ra_idx both for counting and for assignments, so
 	  // ra_idx(0) will both contain fields_numel for each call to
 	  // increment_index and j for each assignment.
-	  Array<int> ra_idx (result_dv.length (), 0);
+	  Array<octave_idx_type> ra_idx (result_dv.length (), 0);
 	  ra_idx(0) = fields_numel;
-	  for (int i = 0; i < m_dv.numel (); i++)
+	  for (octave_idx_type i = 0; i < m_dv.numel (); i++)
 	    {
-	      for (int j = 0; j < fields_numel; j++)
+	      for (octave_idx_type j = 0; j < fields_numel; j++)
 		{
 		  ra_idx(0) = j;
 		  Cell c_tmp = m.contents (keys(j));

Mercurial > octave-nkf

comparison src/ov-cell.cc @ 5275:23b37da9fd5b