Re: GNU Gama 1.7.14 was released on 2005-09-30
Faludi Zoltán <[email protected]> Tue, 4 Oct 2005 10:03:53 +0200
| Newsgroups | gmane.comp.gnu.gama.announce |
|---|---|
| Message-ID | <[email protected]> |
--===============0359161425== Content-Type: multipart/alternative; boundary="----=_Part_4142_31355668.1128413033192" ------=_Part_4142_31355668.1128413033192 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi ALes! I founded a little bug in g3_model_angle.cpp there must include math.h to compile with Borland CBuilder 6 Zoltan 2005/9/30, Ales Cepek <[email protected]>: > > GNU Gama 1.7.14 was released on 2005-09-30 > > It is avalable via ftp from ftp://alpha.gnu.org/gnu/gama/ and > from CVS cvs -d:ext:[email protected]:/cvsroot/gama co gama > > Major changes between versions 1.7.14 and 1.7.13 > ------------------------------------------------ > > - fixed bug reported by Zoltan Faludi > > Index: gamalib/local/median/g2d_coordinates.cpp > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /cvsroot/gama/gama/gamalib/local/median/g2d_coordinates.cpp,v > retrieving revision 1.10 > diff -u -r1.10 g2d_coordinates.cpp > --- g2d_coordinates.cpp 7 May 2005 18:06:20 -0000 1.10 > +++ g2d_coordinates.cpp 30 Sep 2005 08:36:29 -0000 > @@ -212,7 +212,7 @@ > bool ApproximateCoordinates::Solve_insertion() > { > > - const int max_depth =3D 100; > + const int max_depth =3D 5; > if(selected.empty() || (depth >=3D max_depth)) return false; > > // building a point list in local coordinate system. during loop > > - Stephane Kaloustian <[email protected]> translated > *.lang files to French > > - Boris Pihtin <[email protected]> translated gama-local *.lang files > to Russian > > - fixed bugs in printing adjustment results in gama-local > > Index: adjusted_unknowns.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: > /cvsroot/gama/gama/gamalib/local/results/text/adjusted_unknowns.h,v > retrieving revision 1.10 > diff -u -r1.10 adjusted_unknowns.h > --- adjusted_unknowns.h 7 May 2005 18:06:20 -0000 1.10 > +++ adjusted_unknowns.h 29 Aug 2005 17:40:04 -0000 > @@ -78,8 +78,6 @@ > > if (b.free_xy() && b.index_x()) > { > - int i =3D b.index_x(); > - > out.width(IS->maxw_unk()); > out << " " << " "; > out.width(IS->maxw_id()); > @@ -88,13 +86,13 @@ > else > out << " "; > prev_id =3D point_id; > - Double mx =3D IS->unknown_stdev(i); > - Double my =3D IS->unknown_stdev(i+1); > + Double mx =3D IS->unknown_stdev(b.index_x()); > + Double my =3D IS->unknown_stdev(b.index_y()); > mp =3D sqrt(my*my+mx*mx); > out << '\n'; > > out.width(IS->maxw_unk()); > - out << i << " "; > + out << b.index_x() << " "; > out.width(IS->maxw_id()); > if (b.constrained_xy()) > out << "X" << " * "; > @@ -102,7 +100,7 @@ > out << "x" << " "; > out.precision(5); > out.width(13); > - Double adj_x =3D b.x()+x(i)/1000; > + Double adj_x =3D b.x()+x(b.index_x())/1000; > out << b.x_0() << " "; > out.width(9); > out << (adj_x - b.x_0()) << " "; > @@ -117,7 +115,7 @@ > > out.flush(); > out.width(IS->maxw_unk()); > - out << (i+1) << " "; > + out << b.index_y() << " "; > out.width(IS->maxw_id()); > if (b.constrained_xy()) > out << "Y" << " * "; > @@ -125,7 +123,7 @@ > out << "y" << " "; > out.precision(5); > out.width(13); > - Double adj_y =3D y_sign*(b.y()+x(i+1)/1000); > + Double adj_y =3D y_sign*(b.y()+x(b.index_y())/1000); > out << y_sign*b.y_0() << " "; > out.width(9); > out << (adj_y - y_sign*b.y_0()) << " "; > @@ -140,8 +138,6 @@ > } > if (b.free_z() && b.index_z()) > { > - int i =3D b.index_z(); > - > if (!b.free_xy()) > { > out.width(IS->maxw_unk()); > @@ -156,7 +152,7 @@ > prev_id =3D point_id; > > out.width(IS->maxw_unk()); > - out << i << " "; > + out << b.index_z() << " "; > out.width(IS->maxw_id()); > if (b.constrained_z()) > out << "Z" << " * "; > @@ -164,18 +160,18 @@ > out << "z" << " "; > out.precision(5); > out.width(13); > - Double adj_z =3D b.z()+x(i)/1000; > + Double adj_z =3D b.z()+x(b.index_z())/1000; > out << b.z_0() << " "; > out.width(9); > out << (adj_z - b.z_0()) << " "; > out.width(13); > out << adj_z << " "; > - double mv =3D IS->unknown_stdev(i); > + double mz =3D IS->unknown_stdev(b.index_z()); > out.precision(1); > out.width(7); > - out << mv << " "; > + out << mz << " "; > out.width(7); > - out << mv*kki; > + out << mz*kki; > out << "\n"; > } > > Index: error_ellipses.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /cvsroot/gama/gama/gamalib/local/results/text/error_ellipses.h,= v > retrieving revision 1.11 > diff -u -r1.11 error_ellipses.h > --- error_ellipses.h 7 May 2005 18:06:20 -0000 1.11 > +++ error_ellipses.h 29 Aug 2005 17:40:05 -0000 > @@ -98,14 +98,15 @@ > for (PointData::const_iterator > point=3DIS->PD.begin(); point!=3DIS->PD.end(); ++point) > if ((*point).second.free_xy()) > - if (int i =3D (*point).second.index_x()) > + if ((*point).second.index_x()) > { > const PointID point_id =3D (*point).first; > out.width(IS->maxw_id()); > out << point_id.c_str() << ' '; > > - Double my =3D IS->unknown_stdev(i); > - Double mx =3D IS->unknown_stdev(i+1); > + const LocalPoint& p =3D (*point).second; > + Double my =3D IS->unknown_stdev(p.index_y()); > + Double mx =3D IS->unknown_stdev(p.index_x()); > > Double mp =3D sqrt(my*my+mx*mx); > if (mp < 1000) > @@ -172,8 +173,8 @@ > out << bk << ' '; > > Double g =3D 0; > - Double dx =3D x( i ); > - Double dy =3D y_sign*x(i+1); > + Double dx =3D x( p.index_x() ); > + Double dy =3D y_sign*x( p.index_y() ); > Double p1 =3D (dx*cos(alfa) + dy*sin(alfa)); > Double p2 =3D (dy*cos(alfa) - dx*sin(alfa)); > if (ak > 0 && bk > 0 && bk > ak*1e-4) > > > - fixed bug in dataparser_adj.cpp > > Index: dataparser_adj.cpp > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /cvsroot/gama/gama/gnu_gama/xml/dataparser_adj.cpp,v > retrieving revision 1.3 > diff -r1.3 dataparser_adj.cpp > 60a61,67 > > // ..... <adj-input-data> ........................................ > > > > init(s_gama_data, t_adj_input_data, > > s_adj_input_data_1, s_adj_input_data_5, 0, > > &DataParser::adj_input_data, 0, &DataParser::adj_input_data, > > s_adj_input_data_4); > > > > - scripts/gnu_gama_dep.cpp: updated parameters for projects build > under MS Visual C++ 2005 Express Edition > > > - fixed possible undefined behavior of bad regularization during > revision of points > > Index: gamalib/local/network.cpp > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /cvsroot/gama/gama/gamalib/local/network.cpp,v > retrieving revision 1.20 > diff -u -r1.20 network.cpp > --- gamalib/local/network.cpp 7 May 2005 18:06:19 -0000 1.20 > +++ gamalib/local/network.cpp 20 Jun 2005 20:31:00 -0000 > @@ -610,15 +610,40 @@ > > int LocalNetwork::null_space() > { > - try { > - vyrovnani_(); > - } > - catch(const MatVecException& vs) { > - if (vs.error !=3D GNU_gama::Exception::BadRegularization) throw; > - } > + try > + { > + vyrovnani_(); > + } > + catch(const MatVecException& vs) > + { > + if (vs.error !=3D GNU_gama::Exception::BadRegularization) throw; > + > + for (Index i=3D1; i<=3Dsum_unknowns(); i++) > + if (lindep(i)) > + { > + const char type =3D unknown_type(i); > + const PointID id =3D unknown_pointid(i); > + > + LocalPoint& p =3D PD[id]; > + if (type =3D=3D 'X' || type =3D=3D 'Y' || type =3D=3D 'R' ) > + { > + p.unused_xy(); > + removed(id, rm_singular_xy ); > + } > + else if (type =3D=3D 'Z' ) > + { > + p.unused_z(); > + removed(id, rm_missing_z ); > + } > + > + return null_space(); > + } > + } > + > return defect(); > } > > > - fixed a bug in local network linearization (possible impact of > this bug used to be adjusted by various data checks in 'gama-local') > > Index: gamalib/local/linearization/xyzdiff.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /cvsroot/gama/gama/gamalib/local/linearization/xyzdiff.h,v > retrieving revision 1.3 > diff -u -r1.3 xyzdiff.h > --- gamalib/local/linearization/xyzdiff.h 7 May 2005 18:06:20 -0000 1.3 > +++ gamalib/local/linearization/xyzdiff.h 19 Jun 2005 11:11:03 -0000 > @@ -96,14 +96,14 @@ > rhs =3D (obs->value() - df)*1e3; > > size =3D 0; > - if (spoint.free_xy()) > + if (spoint.free_z()) > { > if (!spoint.index_z()) spoint.index_z() =3D ++maxn; > index[ size ] =3D spoint.index_z(); > coeff[ size ] =3D -1; > size++; > } > - if (tpoint.free_xy()) > + if (tpoint.free_z()) > { > if (!tpoint.index_z()) tpoint.index_z() =3D ++maxn; > index[ size ] =3D tpoint.index_z(); > > > ------=_Part_4142_31355668.1128413033192 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi ALes!<br> <br> I founded a little bug in g3_model_angle.cpp there must include math.h to c= ompile with Borland CBuilder 6<br> <br> Zoltan<br><br><div><span class=3D"gmail_quote">2005/9/30, Ales Cepek <<a= href=3D"mailto:[email protected]">[email protected]</a>>:</span><blockquote cla= ss=3D"gmail_quote" style=3D"border-left: 1px solid rgb(204, 204, 204); marg= in: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"> GNU Gama 1.7.14 was released on 2005-09-30<br><br>It is avalable via ftp fr= om <a href=3D"ftp://alpha.gnu.org/gnu/gama/">ftp://alpha.gnu.org= /gnu/gama/</a> and<br>from CVS cvs -d:ext:anoncvs@su= bversions.gnu.org:/cvsroot/gama co gama <br><br>Major changes between versions 1.7.14 and 1.7.13<br>---------------= ---------------------------------<br><br> - fixed bug reported by Zoltan Fa= ludi<br><br> Index: gamalib/local/median/g2d_coordinates.cpp<br= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D <br> RCS file: /cvsroot/gama/gama/gamalib/local/median/g2d_coor= dinates.cpp,v<br> retrieving revision 1.10<br> diff= -u -r1.10 g2d_coordinates.cpp<br> --- g2d_coordinates.cpp = ; 7 May 2005 18:06:20 -0000 &= nbsp;1.10<br> +++ g2d_coordinates.cpp 30 Sep 2005 08:= 36:29 -0000<br> @@ -212,7 +212,7 @@<br> = bool ApproximateCoordinates::Solve_insertion()<br> {= <br><br> - const int max_depth =3D 100;<br> &nb= sp; + const int max_depth =3D 5;<br> if(selected.empty() || (depth >=3D m= ax_depth)) return false;<br><br> // buil= ding a point list in local coordinate system. during loop<br><br= > - Stephane Kaloustian <<a href=3D"mailto:[email protected]= et"> [email protected]</a>> translated<br> *.lang f= iles to French<br><br> - Boris Pihtin <<a href=3D"mailto:[email protected]"= >[email protected]</a>> translated gama-local *.lang files<br> = to Russian<br><br> - fixed bugs in printing adjustment results in gama-local<br><br> &nb= sp; Index: adjusted_unknowns.h<br> =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D<br> RCS file: /cvsroot/gama/gama/gamal= ib/local/results/text/adjusted_unknowns.h,v <br> retrieving revision 1.10<br> diff -u -r1.10 ad= justed_unknowns.h<br> --- adjusted_unknowns.h 7 May 2005 18:06:20 -0000 1.10<br> +++= adjusted_unknowns.h 29 Aug 2005 17:40:0= 4 -0000<br> @@ -78,8 +78,6 @@<br><br> &n= bsp; if (b.free_xy() &= amp;& b.index_x())<br> &= nbsp; {<br> - &nb= sp; = int i =3D=20 b.index_x();<br> -<br>  = ; out.widt= h(IS->maxw_unk());<br> &n= bsp; out << " " << " ";<br> &= nbsp; &nbs= p; out.width(IS->maxw_id());<br> @@ -88,13 +86,13 @@<br= > &n= bsp; else<br> &nb= sp; = out << " ";<br> = prev_id =3D poi= nt_id;<br> - &n= bsp; Double mx =3D IS->unknown_stdev(i);<br> - &n= bsp; Double my =3D IS->unknown_stdev(i+1);<br> + &n= bsp; Double mx =3D IS->unknown_stdev(b.index_x());<br> + &n= bsp; Double my =3D IS->unknown_stdev(b.index_y());<br> = &nb= sp;mp =3D sqrt(my*my+mx*mx);<br> &= nbsp; out << '\n= ';<br><br>  = ; out.width(IS->maxw_unk());<br= > - = out << i << " ";<br> &nb= sp; + &n= bsp; out << b.index_x() << " ";<br> &nb= sp; = out.width(IS->maxw_id());<br> &= nbsp; if (b.constrained_xy())<br> &nb= sp; out << "X" << " * ";<br> @@ -102,7 = +100,7 @@<br> &n= bsp; out << "x" << " ";<br> &= nbsp; &nbs= p; out.precision(5);<br> &nbs= p; o= ut.width(13);<br> - &n= bsp; Double adj_x =3D b.x()+x(i)/1000;<br> + &n= bsp; Double adj_x =3D b.x()+x(b.index_x())/1000;<br>  = ; ou= t << b.x_0() << " ";<br> &= nbsp; &nbs= p;out.width(9);<br> &n= bsp; out << (adj_x - b.x_0()) << " ";<br> @@ -117,= 7 +115,7 @@<br><br> &n= bsp; out.flush();<br> &= nbsp; &nbs= p; out.width(IS->maxw_unk());<br> - &n= bsp; out << (i+1) << " ";<br> + &n= bsp; out << b.index_y() << " ";<br> &nb= sp; = out.width(IS->maxw_id());<br> &= nbsp; if (b.constrained_xy())<br> &nb= sp; out << "Y" << " * ";<br> @@ -125,7 = +123,7 @@<br> &n= bsp; out << "y" << " ";<br> &= nbsp; &nbs= p; out.precision(5);<br> &nbs= p; o= ut.width(13);<br> - &n= bsp; Double adj_y =3D y_sign*(b.y()+x(i+1)/1000);<br> + &n= bsp; Double adj_y =3D y_sign*(b.y()+x(b.index_y())/1000);<br> &n= bsp;  = ; out << y_sign*b.y_0() << " ";<br> = &nb= sp; out.width(9);<br> &= nbsp; out << (adj_y - y_sign*b.y_0()) << " ";<br> @= @ -140,8 +138,6 @@<br>  = ; }<br> &nb= sp; if (b.free_z() &am= p;& b.index_z())<br> &nb= sp; {<br> -  = ; in= t i =3D b.index_z ();<br> -<br> &n= bsp; if (!b.free_xy())= <br>  = ; {<br> &nb= sp; = out.width(IS->maxw_unk());<br> = @@ -156,7 +152,7 @@<br> &nb= sp; prev_id =3D = point_id;<br><br> &nbs= p; out.width(IS->maxw_unk());<br> - &nbs= p; out << i <= < " ";<br> + &n= bsp; out << b.index_z() << " ";<br> &nb= sp; = out.width(IS->maxw_id());<br> &= nbsp; if (b.constrained_z())<br> &nbs= p; out << "Z" << " * ";<br> @@ -164,18= +160,18 @@<br> = out << "z" << " ";<br> &= nbsp; &nbs= p; out.precision(5);<br> &nbs= p; o= ut.width(13);<br> - &n= bsp; Double adj_z =3D b.z()+x(i)/1000;<br> + &n= bsp; Double adj_z =3D b.z()+x(b.index_z())/1000;<br>  = ; ou= t << b.z_0() << " ";<br> &= nbsp; &nbs= p;out.width(9);<br> &n= bsp; out << (adj_z - b.z_0()) << " ";<br> &nb= sp; = out.width(13);<br> &nb= sp; out << adj_z << " ";<br> - &n= bsp; double mv =3D IS->unknown_stdev(i);<br> + &n= bsp; double mz =3D IS->unknown_stdev(b.index_z());<br> = &nb= sp;out.precision(1);<br> &nb= sp; out.width(7);<br>&= nbsp; - &n= bsp; out << mv << " ";<br> &nbs= p; +  = ; out << mz << " "; <br>  = ; out.width(7);<br> - &= nbsp; &nbs= p;out << mv*kki;<br> +  = ; out << mz*kki;<br>&n= bsp;  = ; out << "\n";<br> = &nb= sp; }<br><br> Index: error_ellipses.h <br> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D<br>&n= bsp; RCS file: /cvsroot/gama/gama/gamalib/local/results/text/error_el= lipses.h,v<br> retrieving revision 1.11<br> diff -u= -r1.11 error_ellipses.h <br> --- error_ellipses.h 7 May 2005 18:06:20 -0000 = 1.11<br> +++ error_ellipses.h 29 Aug 2= 005 17:40:05 -0000<br> @@ -98,14 +98,15 @@<br>  = ; for (PointData::const_iterator<= br> = point=3DIS-> PD.begin(); point!=3DIS->PD.end(); ++point)<br> &= nbsp; if ((*point).second.free_xy())<br> = ; - if (i= nt i =3D (*point).second.index_x())<br> + &nbs= p; if ((*point).second.index_x())<br>&n= bsp;  = ; {<br> &n= bsp; const PointID point_id =3D (*point).first;<br> = &nb= sp; out.width(IS->maxw_id());<br> &= nbsp; out << point_id.c_str() << ' ';<br><br> - &n= bsp; Double my =3D IS->unknown_stdev(i);<br> - &n= bsp; Double mx =3D IS->unknown_stdev(i+1);<br> + &n= bsp; const LocalPoint& p =3D (*point).second;<br> + &n= bsp; Double my =3D IS->unknown_stdev(p.index_y());<br> + &n= bsp; Double mx =3D IS->unknown_stdev(p.index_x());<br><br> &= nbsp; &nbs= p; Double mp =3D sqrt(my*my+mx*mx);<br> &nb= sp; if (m= p < 1000)<br> @@ -172,8 +173,8 @@<br>  = ; &n= bsp; out << bk << ' ';<br><br> &n= bsp;  = ; Double g =3D 0;<br> - &n= bsp; Double dx =3D x( i );<br> - &n= bsp; Double dy =3D y_sign*x(i+1);<br> + &n= bsp; Double dx =3D x( p.index_x() );<br> + &n= bsp; Double dy =3D y_sign*x( p.index_y() );<br> &nb= sp; = Double p1 =3D (dx*cos(alfa) + dy*sin(alfa));<br> &nb= sp; = Double p2 =3D (dy*cos(alfa) - dx*sin(alfa));<br> &nb= sp; = if (ak > 0 && bk > 0 && bk > ak*1e-4)<br><br><br> = - fixed bug in dataparser_adj.cpp<br><br> Index: dataparser_adj= .cpp<br> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D<br= > RCS file: /cvsroot/gama/gama/gnu_gama/xml/dataparser_adj.cpp,v= <br> retrieving revision 1.3<br> diff -r1.3 datapar= ser_adj.cpp<br> 60a61,67<br> > // ..= ... <adj-input-data> ..........................= .............. <br> ><br> > init(s_gama_data, t_= adj_input_data,<br> > &nb= sp; s_adj_input_data_1, s_adj_input_data_5, 0,<br> > &DataParser::adj_in= put_data, 0, &DataParser::adj_input_data,<br> > &= nbsp; s_adj_input_data_4);<br> ><br><= br> - scripts/gnu_gama_dep.cpp: updated parameters for projects build<br>&n= bsp; under MS Visual C++ 2005 Express Edition<br><br><br> - fixed pos= sible undefined behavior of bad regularization during <br> revision of points<br><br> Index: gamalib/loca= l/network.cpp<br> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D<br> RCS file: /cvsroot/gama/gama/gamalib/local/network.c= pp,v<br> retrieving revision=20 1.20<br> diff -u -r1.20 network.cpp<br> --- gamalib/local/network.cpp 7 May 2005 18:06:19 -0000 1.20<br> &= nbsp; +++ gamalib/local/network.cpp &nbs= p; 20 Jun 2005 20:31:00 -0000<br> @@ -610,15 +610,40 @@<br= ><br> int LocalNetwork::null_space()<br> = {<br> - try {<br> - &nb= sp; vyrovnani_(); <br> - }<br> - catch(const Ma= tVecException& vs) {<br> - if (vs.er= ror !=3D GNU_gama::Exception::BadRegularization) throw;<br> -&n= bsp; }<br> + try<br> + &= nbsp; {<br> + vyrovnani= _();<br> + }<br> + &nbs= p;catch(const MatVecException& vs) <br> + {<br> + &n= bsp; if (vs.error !=3D GNU_gama::Exception::BadRegularizat= ion) throw;<br> +<br> + &nbs= p; for (Index i=3D1; i<=3Dsum_unknowns(); i++)<br> +&nb= sp; if (lindep(i))<br> = + {<br> &n= bsp; + co= nst char type =3D unknown_type(i);<br> + co= nst PointID id =3D unknown_pointid(i);<br> +<br> &= nbsp; + &n= bsp;LocalPoint& p =3D PD[id];<br> + if (type =3D=3D 'X' || type =3D=3D 'Y' || type =3D=3D 'R' )<br> +&= nbsp; &nbs= p; {<br> + = p.unused_xy();<br> &nb= sp; + &n= bsp; removed(id, rm_singular_xy );<br> + &nbs= p; }<br> + = else if (type = =3D=3D 'Z' )<br> + &nb= sp; {<br> +  = ; &n= bsp;p.unused_z();<br> + &n= bsp; removed(id, rm_missing_z );<br> + = }<br> +<br> &nbs= p; +  = ;return null_space();<br> + = }<br> + }<br>&nb= sp; +<br> return defect();<br>&nbs= p; }<br><br><br> - fixed a bug in local network linearizat= ion (possible impact of <br> this bug used to be adjusted by various data checks in 'ga= ma-local')<br><br> Index: gamalib/local/linearization/xyzdiff.h= <br> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D<br>&n= bsp; RCS file: /cvsroot/gama/gama/gamalib/local/linearization/xyzdiff= .h,v <br> retrieving revision 1.3<br> diff -u -r1.3 xyzd= iff.h<br> --- gamalib/local/linearization/xyzdiff.h = 7 May 2005 18:06:20 -0000 1.3<br> +++ gamalib/local= /linearization/xyzdiff.h 19 Jun 2005 11:11:03 -0000<= br> @@ -96,14 +96,14 @@<br> rhs= =3D (obs->value() - df)*1e3;<br><br>  = ;size =3D 0;<br> - if (spoint.free_xy())<br> &n= bsp; + if (spoint.free_z())<br> &nb= sp; {<br> &= nbsp;if (!spoint.index_z()) spoint.index_z() =3D ++maxn; <br> index[ size= ] =3D spoint.index_z();<br> = coeff[ size ] =3D -1;<br> &n= bsp; size++;<br> = }<br> - if (tpoint.free_xy())<br>&= nbsp; + if (tpoint.free_z())<br> &n= bsp; {<br> = if (!tpoint.index_z())=20 tpoint.index_z() =3D ++maxn;<br> &= nbsp; index[ size ] =3D tpoint.index_z();<br><br><br>= </blockquote></div><br> ------=_Part_4142_31355668.1128413033192-- --===============0359161425== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Info-gama mailing list [email protected] http://lists.gnu.org/mailman/listinfo/info-gama --===============0359161425==--