Hello community, here is the log from the commit of package gama for openSUSE:Factory checked in at 2015-11-11 10:31:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gama (Old) and /work/SRC/openSUSE:Factory/.gama.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gama" Changes: -------- --- /work/SRC/openSUSE:Factory/gama/gama.changes 2015-09-02 00:35:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gama.new/gama.changes 2015-11-11 10:35:35.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Nov 9 16:46:24 UTC 2015 - astieger@suse.com + +- update to 1.17: + * minor fixes in documentation + * fixed a bug in SQL schema + * new export of XML network definition + * C++11 features enabled (-std=c++11 for g++ compiler) + * fixed several minor bugs + +------------------------------------------------------------------- Old: ---- gama-1.16.tar.gz gama-1.16.tar.gz.sig New: ---- gama-1.17.tar.gz gama-1.17.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gama.spec ++++++ --- /var/tmp/diff_new_pack.JF6D2d/_old 2015-11-11 10:35:36.000000000 +0100 +++ /var/tmp/diff_new_pack.JF6D2d/_new 2015-11-11 10:35:36.000000000 +0100 @@ -17,7 +17,7 @@ Name: gama -Version: 1.16 +Version: 1.17 Release: 0 Summary: Adjustment of geodetic networks License: GPL-3.0+ ++++++ gama-1.16.tar.gz -> gama-1.17.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/ChangeLog new/gama-1.17/ChangeLog --- old/gama-1.16/ChangeLog 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/ChangeLog 2015-11-08 13:16:21.000000000 +0100 @@ -1,3 +1,30 @@ +2015-11-08 Ales Cepek <cepek@gnu.org> + + * new release 1.17 + + This is a maintainer's version introducing some basic functions + for handling inconsistent systems (like right-handed coordinates + with left-handed angles). Gama-local program solves this problem + by internally changig signs of all Y coordinates, together with + observed Y coordinates and Y differences (vectors). + + All y signed information is changed in the output. This works file + for batch processing (gama-local) but fails in interactive + dialogue environment of Qt based gama-q2 where all input + information can be edited by user and changed signed Y coordinates + (and observations) must be switched only once. + +2015-07-25 Ales Cepek <cepek@gnu.org> + + * fixed two bugs reported by Greg Troxel <gdt@lexort.com> + ** The bug with the tests is that they specify /bin/bash as the shell. + POSIX does not require bash to be present. + ** Bad conditional in test for availability of xmllint parser. + +2015-07-24 Ales Cepek <cepek@gnu.org> + + * new release version 1.16 + 2015-05-22 Ales Cepek <cepek@gnu.org> * 1.15j fixed a bug in LocalNetwork class reported independently by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/NEWS new/gama-1.17/NEWS --- old/gama-1.16/NEWS 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/NEWS 2015-07-31 14:00:08.000000000 +0200 @@ -1,5 +1,13 @@ GNU Gama NEWS - History of user-visible changes. +Version 1.16 Jula 2015 + +* minor fixes in documentation +* fixed a bug in SQL schema +* new export of XML network definition +* C++11 features enabled (-std=c++11 for g++ compiler) +* fixed several minor bugs + Version 1.15 February 2014 * DTD replaced with XSD for gama-local.xsd and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/bin/gama-local.cpp new/gama-1.17/bin/gama-local.cpp --- old/gama-1.16/bin/gama-local.cpp 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/bin/gama-local.cpp 2015-11-03 18:33:04.000000000 +0100 @@ -445,10 +445,12 @@ try { - if (!GaMaConsistent(IS->PD)) - { - // cout << T_GaMa_inconsistent_coordinates_and_angles << "\n\n\n"; - } + // if (!GaMaConsistent(IS->PD)) + // { + // cout << T_GaMa_inconsistent_coordinates_and_angles << "\n\n\n"; + // } + IS->remove_inconsistency(); + Acord acord(IS->PD, IS->OD); acord.execute(); ReducedObservationsText(IS,&(acord.RO), cout); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/configure new/gama-1.17/configure --- old/gama-1.16/configure 2015-07-24 20:29:34.000000000 +0200 +++ new/gama-1.17/configure 2015-11-08 14:09:31.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gama 1.16. +# Generated by GNU Autoconf 2.69 for gama 1.17. # # Report bugs to <bug-gama@gnu.org>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='gama' PACKAGE_TARNAME='gama' -PACKAGE_VERSION='1.16' -PACKAGE_STRING='gama 1.16' +PACKAGE_VERSION='1.17' +PACKAGE_STRING='gama 1.17' PACKAGE_BUGREPORT='bug-gama@gnu.org' PACKAGE_URL='' @@ -1283,7 +1283,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gama 1.16 to adapt to many kinds of systems. +\`configure' configures gama 1.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1349,7 +1349,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gama 1.16:";; + short | recursive ) echo "Configuration of gama 1.17:";; esac cat <<\_ACEOF @@ -1442,7 +1442,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gama configure 1.16 +gama configure 1.17 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1903,7 +1903,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gama $as_me 1.16, which was +It was created by gama $as_me 1.17, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2773,7 +2773,7 @@ # Define the identity of the package. PACKAGE='gama' - VERSION='1.16' + VERSION='1.17' cat >>confdefs.h <<_ACEOF @@ -2865,45 +2865,7 @@ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi fi -# Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : - enableval=$enable_silent_rules; -fi - -case $enable_silent_rules in # ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=0;; -esac -am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } -if test $am_cv_make_support_nested_variables = yes; then - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AM_BACKSLASH='\' - +# AM_SILENT_RULES([yes]) # Checks for programs. for ac_prog in gawk mawk nawk awk @@ -6411,7 +6373,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gama $as_me 1.16, which was +This file was extended by gama $as_me 1.17, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6477,7 +6439,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gama config.status 1.16 +gama config.status 1.17 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/configure.ac new/gama-1.17/configure.ac --- old/gama-1.16/configure.ac 2015-07-24 20:29:11.000000000 +0200 +++ new/gama-1.17/configure.ac 2015-11-08 14:08:41.000000000 +0100 @@ -2,13 +2,13 @@ # Process this file with autoconf to produce a configure script. # AC_PREREQ(2.65) -AC_INIT([gama], [1.16], [bug-gama@gnu.org]) +AC_INIT([gama], [1.17], [bug-gama@gnu.org]) AC_CONFIG_SRCDIR([lib/gnu_gama/version.cpp]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR([scripts/config.aux]) AM_INIT_AUTOMAKE -AM_SILENT_RULES([yes]) +# AM_SILENT_RULES([yes]) # Checks for programs. AC_PROG_AWK diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/doc/gama.info new/gama-1.17/doc/gama.info --- old/gama-1.16/doc/gama.info 2015-07-24 20:36:21.000000000 +0200 +++ new/gama-1.17/doc/gama.info 2015-11-08 14:11:50.000000000 +0100 @@ -1,6 +1,6 @@ This is gama.info, produced by makeinfo version 5.2 from gama.texi. -This is a documentation version of GNU Gama 1.16. +This is a documentation version of GNU Gama 1.17. Copyright (C) 2003, 2013 Aleš Čepek. @@ -14,7 +14,7 @@  File: gama.info, Node: Top, Next: Introduction, Up: (dir) -GNU Gama 1.16 +GNU Gama 1.17 ************* * Menu: @@ -213,7 +213,7 @@ $ ./gama-local - Adjustment of local geodetic network version: 1.16 / GNU g++ + Adjustment of local geodetic network version: 1.17 / GNU g++ ************************************ http://www.gnu.org/software/gama/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/doc/stamp-vti new/gama-1.17/doc/stamp-vti --- old/gama-1.16/doc/stamp-vti 2015-07-24 20:29:38.000000000 +0200 +++ new/gama-1.17/doc/stamp-vti 2015-11-08 14:11:40.000000000 +0100 @@ -1,4 +1,4 @@ -@set UPDATED 24 July 2015 +@set UPDATED 31 July 2015 @set UPDATED-MONTH July 2015 -@set EDITION 1.16 -@set VERSION 1.16 +@set EDITION 1.17 +@set VERSION 1.17 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/doc/version.texi new/gama-1.17/doc/version.texi --- old/gama-1.16/doc/version.texi 2015-07-24 20:29:38.000000000 +0200 +++ new/gama-1.17/doc/version.texi 2015-11-08 14:11:40.000000000 +0100 @@ -1,4 +1,4 @@ -@set UPDATED 24 July 2015 +@set UPDATED 31 July 2015 @set UPDATED-MONTH July 2015 -@set EDITION 1.16 -@set VERSION 1.16 +@set EDITION 1.17 +@set VERSION 1.17 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/lib/gnu_gama/local/acord.cpp new/gama-1.17/lib/gnu_gama/local/acord.cpp --- old/gama-1.16/lib/gnu_gama/local/acord.cpp 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/lib/gnu_gama/local/acord.cpp 2015-11-03 18:33:04.000000000 +0100 @@ -57,34 +57,6 @@ for (ObservationData::const_iterator i=OD.begin(), e=OD.end(); i!=e; ++i, ++observations); - - - if (GaMaConsistent(PD)) return; - - for (PointData::iterator ii=PD.begin(); ii!=PD.end(); ++ii) - { - LocalPoint& p = (*ii).second; - - if (p.test_xy()) p.set_xy(p.x(), -p.y()); - } - - for (ObservationData::ClusterList::iterator - ci=OD.clusters.begin(), ei=OD.clusters.end(); ci!=ei; ++ci) - { - ObservationData::ClusterType *cluster = *ci; - for (ObservationList::iterator - m = cluster->observation_list.begin(), - e = cluster->observation_list.end() ; m!=e; ++m) - { - Observation *obs = *m; - bool b = false; - - if (dynamic_cast<Y*> (obs)) b = true; - else if (dynamic_cast<Ydiff*>(obs)) b = true; - - if (b) obs->set_value( -obs->value() ); - } - } } void Acord::execute() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/lib/gnu_gama/local/gamadata.h new/gama-1.17/lib/gnu_gama/local/gamadata.h --- old/gama-1.16/lib/gnu_gama/local/gamadata.h 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/lib/gnu_gama/local/gamadata.h 2015-11-03 18:33:04.000000000 +0100 @@ -50,14 +50,6 @@ std::ostream& operator << (std::ostream&, PointData&); std::ostream& operator << (std::ostream& str, ObservationData&); - - inline bool GaMaConsistent(const PointData& lcs) - { - return - (lcs. left_handed_coordinates() && lcs. left_handed_angles()) || - (lcs.right_handed_coordinates() && lcs.right_handed_angles()); - } - }} // namepsace GNU_gama::local diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/lib/gnu_gama/local/html.cpp new/gama-1.17/lib/gnu_gama/local/html.cpp --- old/gama-1.16/lib/gnu_gama/local/html.cpp 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/lib/gnu_gama/local/html.cpp 2015-11-03 18:33:04.000000000 +0100 @@ -488,7 +488,6 @@ set_title("GNU Gama"); set_style("<style type='text/css'>\n" - " body { font-size:10pt; }\n" " table { border:0; margin:0.2em 0; }\n" " th { white-space:nowrap; }\n" "</style>\n"); @@ -1006,7 +1005,7 @@ using namespace std; using namespace GNU_gama::local; - const int y_sign = GaMaConsistent(lnet->PD) ? +1 : -1; + const int y_sign = lnet->y_sign(); int pocpevb=0, pocpevv=0; for (PointData::iterator i=lnet->PD.begin(); i!=lnet->PD.end(); ++i) @@ -1056,7 +1055,7 @@ using namespace std; using namespace GNU_gama::local; - const int y_sign = GaMaConsistent(lnet->PD) ? +1 : -1; + const int y_sign = lnet->y_sign(); const Vec& x = lnet->solve(); double kki = lnet->conf_int_coef(); @@ -1330,7 +1329,7 @@ using namespace std; using namespace GNU_gama::local; - const int y_sign = GaMaConsistent(lnet->PD) ? +1 : -1; + const int y_sign = lnet->y_sign(); const Vec& x = lnet->solve(); double elp_k = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/lib/gnu_gama/local/localnetwork2sql.cpp new/gama-1.17/lib/gnu_gama/local/localnetwork2sql.cpp --- old/gama-1.16/lib/gnu_gama/local/localnetwork2sql.cpp 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/lib/gnu_gama/local/localnetwork2sql.cpp 2015-11-03 18:33:04.000000000 +0100 @@ -46,7 +46,7 @@ WriteSQLVisitor(std::ostream& outStream, GNU_gama::local::LocalNetwork* net) : ostr(outStream), netinfo(net), residuals(netinfo->residuals()), - index(0), y_sign(GaMaConsistent(netinfo->PD) ? +1 : -1), + index(0), y_sign(netinfo->y_sign()), kki(netinfo->conf_int_coef()) { } @@ -656,7 +656,7 @@ if (localNetwork.is_adjusted()) { LocalNetwork* netinfo = &localNetwork; - const int y_sign = GaMaConsistent(netinfo->PD) ? +1 : -1; + const int y_sign = netinfo->y_sign(); const Vec& x = netinfo->solve(); { // general parameters diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/lib/gnu_gama/local/network.cpp new/gama-1.17/lib/gnu_gama/local/network.cpp --- old/gama-1.16/lib/gnu_gama/local/network.cpp 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/lib/gnu_gama/local/network.cpp 2015-11-03 18:33:04.000000000 +0100 @@ -228,6 +228,8 @@ // ellipsoid_ = ""; // has_ellipsoid_ = false; clear_nullable_data(); + + removed_inconsistency_ = false; } @@ -1545,3 +1547,58 @@ } xml += "\n</cov-mat>\n"; } + +bool LocalNetwork::consistent() const +{ + return PD.left_handed_coordinates() == PD.left_handed_angles(); +} + +double LocalNetwork::y_sign() const +{ + return consistent() ? +1.0 : -1.0; +} + +void LocalNetwork::remove_inconsistency() +{ + if (consistent()) return; + if (removed_inconsistency_) return; + + change_y_signs_for_inconsistent_system_(); + removed_inconsistency_ = true; +} + +void LocalNetwork::return_inconsistency() +{ + if (!removed_inconsistency_) return; + + change_y_signs_for_inconsistent_system_(); + removed_inconsistency_ = false; +} + +void LocalNetwork::change_y_signs_for_inconsistent_system_() +{ + for (PointData::iterator ii=PD.begin(); ii!=PD.end(); ++ii) + { + LocalPoint& p = (*ii).second; + + if (p.test_xy()) p.set_xy(p.x(), -p.y()); + } + + for (ObservationData::ClusterList::iterator + ci=OD.clusters.begin(), ei=OD.clusters.end(); ci!=ei; ++ci) + { + ObservationData::ClusterType *cluster = *ci; + for (ObservationList::iterator + m = cluster->observation_list.begin(), + e = cluster->observation_list.end() ; m!=e; ++m) + { + Observation *obs = *m; + bool b = false; + + if (dynamic_cast<Y*> (obs)) b = true; + else if (dynamic_cast<Ydiff*>(obs)) b = true; + + if (b) obs->set_value( -obs->value() ); + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/lib/gnu_gama/local/network.h new/gama-1.17/lib/gnu_gama/local/network.h --- old/gama-1.16/lib/gnu_gama/local/network.h 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/lib/gnu_gama/local/network.h 2015-11-03 18:33:04.000000000 +0100 @@ -1,5 +1,5 @@ /* GNU Gama -- adjustment of geodetic networks - Copyright (C) 1999, 2006, 2012, 2014 Ales Cepek <cepek@gnu.org> + Copyright (C) 1999, 2006, 2012, 2014, 2015 Ales Cepek <cepek@gnu.org> This file is part of the GNU Gama C++ library. @@ -307,6 +307,10 @@ // ##################################################################### + bool consistent() const; + double y_sign() const; + void remove_inconsistency(); + void return_inconsistency(); private: @@ -388,6 +392,12 @@ void prepareProjectEquations(); bool singular_coords(const Mat&); + // fixing inconsitent systems + + void change_y_signs_for_inconsistent_system_(); + bool removed_inconsistency_ {false}; + + }; /* class LocalNetwork */ }} /* namespace GNU_gama::local */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/lib/gnu_gama/local/results/text/adjusted_observations.h new/gama-1.17/lib/gnu_gama/local/results/text/adjusted_observations.h --- old/gama-1.16/lib/gnu_gama/local/results/text/adjusted_observations.h 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/lib/gnu_gama/local/results/text/adjusted_observations.h 2015-11-03 18:33:04.000000000 +0100 @@ -274,7 +274,7 @@ using namespace GNU_gama::local; // using GNU_gama::local::Double; - const int y_sign = GaMaConsistent(IS->PD) ? +1 : -1; + const int y_sign = IS->y_sign(); const Vec& v = IS->residuals(); const int pocmer = IS->sum_observations(); const double scale = IS->gons() ? 1.0 : 0.324; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/lib/gnu_gama/local/results/text/adjusted_unknowns.h new/gama-1.17/lib/gnu_gama/local/results/text/adjusted_unknowns.h --- old/gama-1.16/lib/gnu_gama/local/results/text/adjusted_unknowns.h 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/lib/gnu_gama/local/results/text/adjusted_unknowns.h 2015-11-03 18:33:04.000000000 +0100 @@ -35,7 +35,7 @@ using namespace std; using namespace GNU_gama::local; - const int y_sign = GaMaConsistent(IS->PD) ? +1 : -1; + const int y_sign = IS->y_sign(); const Vec& x = IS->solve(); Double kki = IS->conf_int_coef(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/lib/gnu_gama/local/results/text/error_ellipses.h new/gama-1.17/lib/gnu_gama/local/results/text/error_ellipses.h --- old/gama-1.16/lib/gnu_gama/local/results/text/error_ellipses.h 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/lib/gnu_gama/local/results/text/error_ellipses.h 2015-11-03 18:33:04.000000000 +0100 @@ -36,7 +36,7 @@ using namespace GNU_gama::local; using GNU_gama::local::Double; - const int y_sign = GaMaConsistent(IS->PD) ? +1 : -1; + const int y_sign = IS->y_sign(); const Vec& x = IS->solve(); Double elp_k = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/lib/gnu_gama/local/results/text/fixed_points.h new/gama-1.17/lib/gnu_gama/local/results/text/fixed_points.h --- old/gama-1.16/lib/gnu_gama/local/results/text/fixed_points.h 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/lib/gnu_gama/local/results/text/fixed_points.h 2015-11-03 18:33:04.000000000 +0100 @@ -35,7 +35,7 @@ using namespace std; using namespace GNU_gama::local; - const int y_sign = GaMaConsistent(IS->PD) ? +1 : -1; + const int y_sign = IS->y_sign(); int pocpevb=0, pocpevv=0; { // for ... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/lib/gnu_gama/local/svg.cpp new/gama-1.17/lib/gnu_gama/local/svg.cpp --- old/gama-1.16/lib/gnu_gama/local/svg.cpp 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/lib/gnu_gama/local/svg.cpp 2015-11-03 18:33:04.000000000 +0100 @@ -36,7 +36,7 @@ GamaLocalSVG::GamaLocalSVG(LocalNetwork* is) : IS(*is), PD(is->PD), OD(is->OD), - ysign(GaMaConsistent(PD) ? +1 : -1) + y_sign(is->y_sign()) { restoreDefaults(); } @@ -134,8 +134,8 @@ // skip points that are not part of the adjustment or do not have xy if (!point.active_xy() || !point.test_xy()) continue; - T11 = TX.x; T12 = TY.x*ysign; - T21 = TX.y; T22 = TY.y*ysign; + T11 = TX.x; T12 = TY.x*y_sign; + T21 = TX.y; T22 = TY.y*y_sign; Tx = 2*offset - minx; Ty = 2*offset - miny; @@ -183,8 +183,8 @@ if (offset == 0) offset = 100; - T11 = TX.x; T12 = TY.x*ysign; - T21 = TX.y; T22 = TY.y*ysign; + T11 = TX.x; T12 = TY.x*y_sign; + T21 = TX.y; T22 = TY.y*y_sign; Tx = 2*offset - minx; Ty = 2*offset - miny; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/lib/gnu_gama/local/svg.h new/gama-1.17/lib/gnu_gama/local/svg.h --- old/gama-1.16/lib/gnu_gama/local/svg.h 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/lib/gnu_gama/local/svg.h 2015-11-03 18:33:04.000000000 +0100 @@ -147,7 +147,7 @@ LocalNetwork& IS; const PointData& PD; const ObservationData& OD; - const double ysign; // consistent coordinates +1, inconsistent -1 + const double y_sign; // consistent coordinates +1, inconsistent -1 mutable std::ostream* svg; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/lib/gnu_gama/xml/localnetworkxml.cpp new/gama-1.17/lib/gnu_gama/xml/localnetworkxml.cpp --- old/gama-1.16/lib/gnu_gama/xml/localnetworkxml.cpp 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/lib/gnu_gama/xml/localnetworkxml.cpp 2015-11-03 18:33:04.000000000 +0100 @@ -549,7 +549,7 @@ void LocalNetworkXML::coordinates(std::ostream& out) const { - const int y_sign = GaMaConsistent(netinfo->PD) ? +1 : -1; + const int y_sign = netinfo->y_sign(); out << "\n<coordinates>\n"; @@ -747,7 +747,7 @@ const GNU_gama::local::Vec& X = netinfo->solve(); //const double scale = netinfo->gons() ? 1.0 : 0.324; - const int y_sign = GaMaConsistent(netinfo->PD) ? +1 : -1; + const int y_sign = netinfo->y_sign(); //const double kki = netinfo->conf_int_coef(); const int unknowns = netinfo->sum_unknowns(); @@ -796,7 +796,7 @@ using namespace std; // using namespace GNU_gama::local; - const int y_sign = GaMaConsistent(netinfo->PD) ? +1 : -1; + const int y_sign = netinfo->y_sign(); const GNU_gama::local::Vec& v = netinfo->residuals(); const int pocmer = netinfo->sum_observations(); const double scale = netinfo->gons() ? 1.0 : 0.324; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/tests/gama-local/scripts/check_xml_results.cpp new/gama-1.17/tests/gama-local/scripts/check_xml_results.cpp --- old/gama-1.16/tests/gama-local/scripts/check_xml_results.cpp 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/tests/gama-local/scripts/check_xml_results.cpp 2015-11-03 18:33:04.000000000 +0100 @@ -61,7 +61,7 @@ double maxdiffxyz = 0; const GNU_gama::local::Vec& x = lnet->solve(); - const int y_sign = GaMaConsistent(lnet->PD) ? +1 : -1; + const int y_sign = lnet->y_sign(); for (size_t i=0; i<adjres->adjusted_points.size(); i++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/tests/gama-local/scripts/check_xyz.cpp new/gama-1.17/tests/gama-local/scripts/check_xyz.cpp --- old/gama-1.16/tests/gama-local/scripts/check_xyz.cpp 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/tests/gama-local/scripts/check_xyz.cpp 2015-11-03 18:33:04.000000000 +0100 @@ -31,7 +31,7 @@ double maxdiff = 0; using namespace GNU_gama::local; - const int y_sign = GaMaConsistent(lnet1->PD) ? +1 : -1; + const int y_sign = lnet1->y_sign(); const Vec& x1 = lnet1->solve(); const Vec& x2 = lnet2->solve(); @@ -152,10 +152,12 @@ try { - if (!GaMaConsistent(lnet->PD)) - { - // cout << T_GaMa_inconsistent_coordinates_and_angles << "\n\n\n"; - } + // if (!GaMaConsistent(lnet->PD)) + // { + // cout << T_GaMa_inconsistent_coordinates_and_angles << "\n\n\n"; + // } + lnet->remove_inconsistency(); + Acord acord(lnet->PD, lnet->OD); acord.execute(); //ReducedObservationsText(lnet,&(acord.RO), cout); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/tests/gama-local/scripts/gama-local-parameters.in new/gama-1.17/tests/gama-local/scripts/gama-local-parameters.in --- old/gama-1.16/tests/gama-local/scripts/gama-local-parameters.in 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/tests/gama-local/scripts/gama-local-parameters.in 2015-07-31 14:00:08.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e @@ -32,7 +32,7 @@ exit 1 fi -if test "x$GNU_GAMA_LOCAL_TEST_XMLLINT" != "xyes"; then +if test "x$GNU_GAMA_LOCAL_TEST_XMLLINT" == "xyes"; then xmllint --schema @GAMA_XML@/gama-local.xsd --noout \ @GAMA_INPUT@/gama-local-par.gkf xmllint --schema @GAMA_XML@/gama-local.xsd --noout \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/tests/gama-local/scripts/gama-local-updated-xml.in new/gama-1.17/tests/gama-local/scripts/gama-local-updated-xml.in --- old/gama-1.16/tests/gama-local/scripts/gama-local-updated-xml.in 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/tests/gama-local/scripts/gama-local-updated-xml.in 2015-07-31 14:00:08.000000000 +0200 @@ -23,7 +23,7 @@ $RES/$t-1.xml \ $RES/$t-2.xml -if test "x$GNU_GAMA_LOCAL_TEST_XMLLINT" != "xyes"; then +if test "x$GNU_GAMA_LOCAL_TEST_XMLLINT" == "xyes"; then xmllint --schema $GAMA_LOCAL_XSD \ $RES/$t-1.gkf --noout fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/tests/gama-local/scripts/xmllint-gama-local-adjustment-xsd.in new/gama-1.17/tests/gama-local/scripts/xmllint-gama-local-adjustment-xsd.in --- old/gama-1.16/tests/gama-local/scripts/xmllint-gama-local-adjustment-xsd.in 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/tests/gama-local/scripts/xmllint-gama-local-adjustment-xsd.in 2015-07-31 14:00:08.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gama-1.16/tests/gama-local/scripts/xmllint-gama-local-xsd.in new/gama-1.17/tests/gama-local/scripts/xmllint-gama-local-xsd.in --- old/gama-1.16/tests/gama-local/scripts/xmllint-gama-local-xsd.in 2015-07-24 17:08:15.000000000 +0200 +++ new/gama-1.17/tests/gama-local/scripts/xmllint-gama-local-xsd.in 2015-07-31 14:00:08.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e