Mercurial > octave

comparison src/graphics.cc @ 11450:5eb10763069f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
substitute and use LAPACK_LIBS in mkoctfile script
author John W. Eaton <jwe@octave.org>
date Thu, 06 Jan 2011 03:10:24 -0500
parents 0d9640d755b1
children 2be9e22796d2
comparison
equal deleted inserted replaced
11449:93b8c7ca211f 11450:5eb10763069f
1841 } 1841 }
1842 else 1842 else
1843 { 1843 {
1844 retval = graphics_handle (next_handle); 1844 retval = graphics_handle (next_handle);
1845 1845
1846 next_handle = ceil (next_handle) - 1.0 - make_handle_fraction (); 1846 next_handle = std::ceil (next_handle) - 1.0 - make_handle_fraction ();
1847 } 1847 }
1848 } 1848 }
1849 1849
1850 return retval; 1850 return retval;
1851 } 1851 }
1886 // but tack on a new random part each time. 1886 // but tack on a new random part each time.
1887 1887
1888 handle_map.erase (p); 1888 handle_map.erase (p);
1889 1889
1890 if (h.value () < 0) 1890 if (h.value () < 0)
1891 handle_free_list.insert (ceil (h.value ()) - make_handle_fraction ()); 1891 handle_free_list.insert (std::ceil (h.value ()) - make_handle_fraction ());
1892 } 1892 }
1893 else 1893 else
1894 error ("graphics_handle::free: invalid object %g", h.value ()); 1894 error ("graphics_handle::free: invalid object %g", h.value ());
1895 } 1895 }
1896 else 1896 else
4332 if (std::abs (min_val - max_val) < sqrt (DBL_EPSILON)) 4332 if (std::abs (min_val - max_val) < sqrt (DBL_EPSILON))
4333 { 4333 {
4334 min_val *= 0.9; 4334 min_val *= 0.9;
4335 max_val *= 1.1; 4335 max_val *= 1.1;
4336 } 4336 }
4337 min_val = pow (10, floor (log10 (min_val))); 4337 min_val = pow (10, gnulib::floor (log10 (min_val)));
4338 max_val = pow (10, ceil (log10 (max_val))); 4338 max_val = pow (10, std::ceil (log10 (max_val)));
4339 } 4339 }
4340 else 4340 else
4341 { 4341 {
4342 if (min_val == 0 && max_val == 0) 4342 if (min_val == 0 && max_val == 0)
4343 { 4343 {
4350 min_val -= 0.1 * std::abs (min_val); 4350 min_val -= 0.1 * std::abs (min_val);
4351 max_val += 0.1 * std::abs (max_val); 4351 max_val += 0.1 * std::abs (max_val);
4352 } 4352 }
4353 4353
4354 double tick_sep = calc_tick_sep (min_val , max_val); 4354 double tick_sep = calc_tick_sep (min_val , max_val);
4355 min_val = tick_sep * std::floor (min_val / tick_sep); 4355 min_val = tick_sep * gnulib::floor (min_val / tick_sep);
4356 max_val = tick_sep * ceil (max_val / tick_sep); 4356 max_val = tick_sep * std::ceil (max_val / tick_sep);
4357 } 4357 }
4358 } 4358 }
4359 4359
4360 retval.resize (1, 2); 4360 retval.resize (1, 2);
4361 4361
4392 lo = std::log10 (lo); 4392 lo = std::log10 (lo);
4393 } 4393 }
4394 4394
4395 double tick_sep = calc_tick_sep (lo , hi); 4395 double tick_sep = calc_tick_sep (lo , hi);
4396 4396
4397 int i1 = static_cast<int> (std::floor (lo / tick_sep)); 4397 int i1 = static_cast<int> (gnulib::floor (lo / tick_sep));
4398 int i2 = static_cast<int> (std::ceil (hi / tick_sep)); 4398 int i2 = static_cast<int> (std::ceil (hi / tick_sep));
4399 4399
4400 if (limmode_is_auto) 4400 if (limmode_is_auto)
4401 { 4401 {
4402 // adjust limits to include min and max tics 4402 // adjust limits to include min and max tics
4415 } 4415 }
4416 else 4416 else
4417 { 4417 {
4418 // adjust min and max tics if they are out of limits 4418 // adjust min and max tics if they are out of limits
4419 i1 = static_cast<int> (std::ceil (lo / tick_sep)); 4419 i1 = static_cast<int> (std::ceil (lo / tick_sep));
4420 i2 = static_cast<int> (std::floor (hi / tick_sep)); 4420 i2 = static_cast<int> (gnulib::floor (hi / tick_sep));
4421 } 4421 }
4422 4422
4423 Matrix tmp_ticks (1, i2-i1+1); 4423 Matrix tmp_ticks (1, i2-i1+1);
4424 for (int i = 0; i <= i2-i1; i++) 4424 for (int i = 0; i <= i2-i1; i++)
4425 { 4425 {
5228 // lower right quadrangle 5228 // lower right quadrangle
5229 cross_product (x(j3,i)-x(j2,i+1), y(j+1,i2)-y(j,i3), z(j+1,i)-z(j,i+1), 5229 cross_product (x(j3,i)-x(j2,i+1), y(j+1,i2)-y(j,i3), z(j+1,i)-z(j,i+1),
5230 x(j3,i+1)-x(j2,i), y(j+1,i3)-y(j,i2), z(j+1,i+1)-z(j,i), 5230 x(j3,i+1)-x(j2,i), y(j+1,i3)-y(j,i2), z(j+1,i+1)-z(j,i),
5231 nx, ny, nz); 5231 nx, ny, nz);
5232 5232
5233 double d = - std::max(std::max(fabs(nx), fabs(ny)), fabs(nz)); 5233 double d = -std::max (std::max (fabs (nx), fabs (ny)), fabs (nz));
5234 5234
5235 nx /= d; 5235 nx /= d;
5236 ny /= d; 5236 ny /= d;
5237 nz /= d; 5237 nz /= d;
5238 } 5238 }