-
Notifications
You must be signed in to change notification settings - Fork 1
/
ChangeLog.2
1447 lines (1041 loc) · 47.6 KB
/
ChangeLog.2
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
/*
##########################################
# See ChangeLog file for newer changes #
##########################################
1.10 2010-07-23 Ales Cepek <[email protected]>
* According to GNU Coding Standards new release is identified with
a pair of version numbers (1.10)
* CVS repository moved to GIT for GNU Gama 1.10
CVS Gama repository imported into git
$ git cvsimport -d:pserver:[email protected]:/sources/gama gama
$ git branch
gama-1-10
gama-1-4
gama-1-8
* master
origin
Imported branch origin (the most recent version of the CVS main trunk) was renamed to gama-1-9
$ git branch -m origin gama-1-9
Branch gama-1-10 merged to master
$ git merge gama-1-10
and branch gama-1-10 was deleted
$ git branch -d gama-1-10
Pushing a Newly-Created, Existing, or Converted Git Repository
--------------------------------------------------------------
$ git push --all -v [email protected]:/srv/git/gama.git
Pushing to [email protected]:/srv/git/gama.git
Counting objects: 8330, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (1911/1911), done.
Writing objects: 100% (8330/8330), 1.88 MiB, done.
Total 8330 (delta 6280), reused 8290 (delta 6257)
To [email protected]:/srv/git/gama.git
* [new branch] gama-1-4 -> gama-1-4
* [new branch] gama-1-8 -> gama-1-8
* [new branch] gama-1-9 -> gama-1-9
* [new branch] master -> master
1.9.07 2009-12-02 Ales Cepek <[email protected]>
* fixed a bug reported by Martin Beckett a trailing space in 3 of
the XML element name
RCS file: /sources/gama/gama/lib/gnu_gama/xml/localnetwork.cpp,v
retrieving revision 1.14
diff -r1.14 localnetwork.cpp
253c253
< tagnl(out, "sum-of-squares ", netinfo->trans_VWV());
---
> tagnl(out, "sum-of-squares", netinfo->trans_VWV());
281c281
< tagnl(out, "probability ", netinfo->conf_pr());
---
> tagnl(out, "probability", netinfo->conf_pr());
309c309
< tagnl(out, "confidence-scale ", netinfo->conf_int_coef());
---
> tagnl(out, "confidence-scale", netinfo->conf_int_coef());
Strictly speaking this was not a bug according to XML 1.0 (5th Ed.)
STag ::= '<' Name (S Attribute)* S? '>'
but there was no use for the trailing spaces in XML tags and as
they caused a problem they were removed.
* Added a new xml tag <tol-abs> into the gama-g3 programa xml
input data for explicit specification of absolute term tolerance
during linearization.
* Fixed a bug reported by Brona Koska <[email protected]> in pinv.h
diff -u -r1.6 pinv.h
--- pinv.h 28 Oct 2008 12:39:19 -0000 1.6
+++ pinv.h 29 Jul 2009 11:10:27 -0000
@@ -66,7 +66,7 @@
Vec<Float,Exc> W_inv(N);
Float t = svd.tol();
for (Index k=1; k<=N; k++)
- if (W(k) > t)
+ if (!svd.lindep(k))
W_inv(k) = 1 / W(k);
else
W_inv(k) = 0;
* Fixed a scale dependent test of "singular coordinates". The bug
was reported by Zdenek Lukes <[email protected]>.
diff -u -r1.9 network.cpp
--- lib/gamalib/local/network.cpp 20 Oct 2007 14:28:02 -0000 1.9
+++ lib/gamalib/local/network.cpp 14 Apr 2009 14:51:22 -0000
@@ -444,9 +444,19 @@
bb += b*b;
}
- D = aa*bb - ab*ab;
+ // old scale dependent test:
+ //
+ // D = aa*bb - ab*ab;
+ //
+ // if ((aa == 0) || (fabs(D) <= aa*1e-6))
+
+ if (bb > aa) std::swap(aa, bb);
+ if (aa == 0)
+ D = 0;
+ else
+ D = 1 - std::abs(ab)/std::sqrt(aa*bb); // 1 - |cos(a,b)|
- if ((aa == 0) || (fabs(D) <= aa*1e-6))
+ if (D < 1e-12)
{
result = true;
p.unused_xy();
2009-01-20 Ales Cepek <[email protected]>
* Karl Berry rearranged some of the introduction text and
corrected a few English things (doc/gama-intrtoduction.texi)
* added makefiles for Microsoft .NET studio to help builidng Gama
for people without access to GNU/Linux
* all figures from 'doc' dorectory moved to a single subdirectory
'fig' to easy publishing of manuals on the web
* removed all notes on Rocinante from the manual, the Roci project
is dead
2008-10-28 Ales Cepek <[email protected]>
* new version 1.9.06
* fixed a bug in pseudoinverse reported by Bronislav Koska
* added missing standard headers (reported by Tomas Kouba and Jan
Pytel)
Index: lib/gamalib/pointid.cpp
===================================================================
RCS file: /sources/gama/gama/lib/gamalib/pointid.cpp,v
retrieving revision 1.2
diff -r1.2 pointid.cpp
28a29
> #include <cstdlib>
43c44
< iid = atoi(sid.c_str());
---
> iid = std::atoi(sid.c_str());
Index: lib/gnu_gama/adj/envelope.h
===================================================================
RCS file: /sources/gama/gama/lib/gnu_gama/adj/envelope.h,v
retrieving revision 1.11
diff -r1.11 envelope.h
29a30
> #include <limits>
Index: lib/gnu_gama/xml/localnetwork.cpp
===================================================================
RCS file: /sources/gama/gama/lib/gnu_gama/xml/localnetwork.cpp,v
retrieving revision 1.12
diff -r1.12 localnetwork.cpp
26a27
> #include <typeinfo>
1.9.05 2007-04-13
- new revision of Hungarian translation by Zoltan Siki (Budapest
University of Technology and Economics in Hungary)
- fixed terminology errors reported by Brona Koska (description of
left-handed and right-handed coordinates adn angular units)
Inline function Consistent (defined in gamadata.h) has been
renamed to GaMaConsistent to reflect its real meaning. (first
version of gama adjustment was designed for coordinate system with
left-handed coordinates and right-handed angular observations and
this combination was supposed to be 'consistent')
- improved performance of Adj::q_bb(int, int) for sparse matrices
- fixed a bug in Adj_envelope::q_xx(int, int) brought in version 1.9.03
- fixed a bug in matvec/vecbase.h (missing test in operator>>)
- new version of matvec C++ template library is 1.0.00
1.9.04 2007-10-20
- new option --cov-band for gama-local
--cov-band covariance matrix of adjusted parameters in XML output
n = -1 for full covariance matrix (implicit value)
n >= 0 covariances are computed only for bandwidth n
- enhanced warning text for gama-local when two identical poins (identical
coordinates) are found; gama-local stops
===================================================================
RCS file: /sources/gama/gama/gama-local/gama-local-main.h,v
retrieving revision 1.7
diff -u -r1.7 gama-local-main.h
--- gama-local/gama-local-main.h 29 Jun 2007 17:50:31 -0000 1.7
+++ gama-local/gama-local-main.h 2 Aug 2007 11:56:35 -0000
@@ -365,6 +365,11 @@
ApproximateCoordinates(&acord, cout);
}
+ catch(GaMaLib::Exception e)
+ {
+ cerr << e.text << endl;
+ return 1;
+ }
catch(...)
{
cerr << "Gama / Acord: approximate coordinates failed\n\n";
Index: lib/gamalib/local/orientation.cpp
===================================================================
RCS file: /sources/gama/gama/lib/gamalib/local/orientation.cpp,v
retrieving revision 1.2
diff -u -r1.2 orientation.cpp
--- lib/gamalib/local/orientation.cpp 26 Jun 2007 15:04:05 -0000 1.2
+++ lib/gamalib/local/orientation.cpp 2 Aug 2007 11:56:36 -0000
@@ -27,7 +27,8 @@
#include <gamalib/cluster.h>
#include <gamalib/local/gamadata.h>
#include <algorithm>
-
+#include <sstream>
+#include <iomanip>
using namespace GaMaLib;
@@ -92,7 +93,36 @@
PointData::const_iterator pb = PL.find(direction->to());
if (pb != PL.end() && (*pb).second.test_xy())
{
- double zn = bearing((*pa).second, (*pb).second);
+ double zn;
+ try
+ {
+ zn = bearing((*pa).second, (*pb).second);
+ }
+ catch (GaMaLib::Exception e)
+ {
+ std::stringstream s;
+ s.precision(5);
+ s << e.text << "\n\n";
+
+ s.precision(5);
+ s.setf(std::ios_base::fixed, std::ios_base::floatfield);
+
+ s << std::setw(13) << pa->first;
+ s << " x = " << std::setw(13) << pa->second.x();
+ s << " y = " << std::setw(13) << pa->second.y();
+ s << "\n";
+
+ s << std::setw(13) << pb->first;
+ s << " x = " << std::setw(13) << pb->second.x();
+ s << " y = " << std::setw(13) << pb->second.y();
+ s << "\n";
+
+ throw GaMaLib::Exception(s.str());
+ }
+ catch (...)
+ {
+ throw;
+ }
double sn = direction->value();
double df = zn - sn;
// if (df < 0) df += 2*M_PI; ...... gamalib-1.1.13
1.9.03 2007-06-29
- upgrade to GPLv3
- fixed bug in gama-local in revision of observed heights
Index: lib/gamalib/local/revision/xyz.h
===================================================================
RCS file: /sources/gama/gama/lib/gamalib/local/revision/xyz.h,v
retrieving revision 1.1
diff -u -6 -r1.1 xyz.h
--- lib/gamalib/local/revision/xyz.h 9 Apr 2006 16:40:25 -0000 1.1
+++ lib/gamalib/local/revision/xyz.h 16 Sep 2006 13:19:43 -0000
@@ -60,13 +60,13 @@
bool LocalRevision::z(const Z* obs) const
{
if (!obs->active()) return false;
PointData::const_iterator s = PD.find(obs->from());
if (s == PD.end()) return false;
- if (!(*s).second.active_xy()) return false;
+ if (!(*s).second.active_z()) return false;
if (!(*s).second.test_z()) return false;
return true;
}
1.9.02 2007-01-21
- fixed bug in nullity/defect() in adj_envelope_implementation.h
- gama-xml.dtd renamed to gama-local.dtt
- fixed bug reported by Jim Sutherland; new XML output: fixed
point Y value has a minus sign (input file was positive)
1.9.01 2006-08-26
#####################################################################
# #
# unstable version 1.9 (main trunk at CVS savannah.gnu.org) #
# #
#####################################################################
- adjustment class LocalNetwork was split from AdjBase
hierarchy. LocalNetwork now has a pointer to AdjBase* (algorithm) so
now, there is no need for virtual inheritance.
- base adjustment class AdjBase was split into two class AdjBase
and class AdjBaseFull : public AdjBase (for implementations of
solutions witw full dense matrices); added a new class AdjBaseSparse.
- new output parameters (--text and --xml); possible redirection
to standard output ("-").
- documentation of gama-local: added formulas for reductions of
horizontal and vertical angles
- added first draft of XML parser of gama-local adjustment results,
class GNU_gama::LocalNetworkAdjustmentResults
- fixed bug in dataparser.cpp / dataparser.h (bad upper limit in tables)
Index: lib/gnu_gama/xml/dataparser.cpp
===================================================================
RCS file: /sources/gama/gama/lib/gnu_gama/xml/dataparser.cpp,v
retrieving revision 1.1
diff -u -r1.1 dataparser.cpp
--- lib/gnu_gama/xml/dataparser.cpp 9 Apr 2006 16:40:25 -0000 1.1
+++ lib/gnu_gama/xml/dataparser.cpp 23 Apr 2006 15:28:01 -0000
@@ -71,7 +71,7 @@
for (int s=s_error; s<=s_stop; s++)
{
- for (int t=0; t<=t_unknown; t++)
+ for (int t=0; t<=t_unused; t++)
{
next[s][t] = s_error;
stag[s][t] = &DataParser::parser_error;
Index: lib/gnu_gama/xml/dataparser.h
===================================================================
RCS file: /sources/gama/gama/lib/gnu_gama/xml/dataparser.h,v
retrieving revision 1.1
diff -u -r1.1 dataparser.h
--- lib/gnu_gama/xml/dataparser.h 9 Apr 2006 16:40:25 -0000 1.1
+++ lib/gnu_gama/xml/dataparser.h 23 Apr 2006 15:28:02 -0000
@@ -353,11 +353,11 @@
typedef int (DataParser::*Data)(const char *name, int len);
typedef int (DataParser::*Etag)(const char *name);
- Stag stag[s_stop+1][t_unknown+1];
+ Stag stag[s_stop+1][t_unused+1];
Data data[s_stop+1];
Etag etag[s_stop+1];
- int next [s_stop+1][t_unknown+1];
+ int next [s_stop+1][t_unused+1];
int after[s_stop+1];
int gama_data (const char *name, const char **atts);
- fixed includes of dataobject.h in gkfparser.h and baseparser.h
Index: lib/gamalib/xml/gkfparser.h
===================================================================
RCS file: /sources/gama/gama/lib/gamalib/xml/gkfparser.h,v
retrieving revision 1.1
diff -u -r1.1 gkfparser.h
--- lib/gamalib/xml/gkfparser.h 9 Apr 2006 16:40:25 -0000 1.1
+++ lib/gamalib/xml/gkfparser.h 22 Apr 2006 13:18:57 -0000
@@ -27,6 +27,7 @@
#define GaMaLib_GKF__XML__parser__h_
#include <gnu_gama/xml/baseparser.h>
+#include <gnu_gama/xml/dataobject.h>
#include <gamalib/local/gamadata.h>
Index: lib/gnu_gama/xml/baseparser.h
===================================================================
RCS file: /sources/gama/gama/lib/gnu_gama/xml/baseparser.h,v
retrieving revision 1.1
diff -u -r1.1 baseparser.h
--- lib/gnu_gama/xml/baseparser.h 9 Apr 2006 16:40:25 -0000 1.1
+++ lib/gnu_gama/xml/baseparser.h 22 Apr 2006 13:18:57 -0000
@@ -30,7 +30,6 @@
// BaseParser is just a simple C++ wrapper for XML parser expat
#include <gnu_gama/xml_expat.h>
-#include <gnu_gama/xml/dataobject.h>
#include <gnu_gama/intfloat.h>
#include <string>
#include <list>
- directory scripts/aux used by build system had to be renamed to
scripts/config.aux because 'aux' is a reserved file name under
Windows and Gama couldn't be build under Cygwin. CVS repository
had to be fixed as well. CVS branch gama-1-8 was mowed to this
point.
- a bug reported by Antonn Horpynich <[email protected]>
cvs diff localnetwork.cpp
Index: localnetwork.cpp
===================================================================
RCS file: /sources/gama/gama/lib/gnu_gama/xml/localnetwork.cpp,v
retrieving revision 1.1
diff -r1.1 localnetwork.cpp
333c333
< const double z = (p.x()+X(p.index_z())/1000);
---
> const double z = (p.z()+X(p.index_z())/1000);
375c375
< const double z = p.x();
---
> const double z = p.z();
419c419
< const double z = (p.x()+X(p.index_z())/1000);
---
> const double z = (p.z()+X(p.index_z())/1000);
1.8.01 2006-04-10
#####################################################################
# #
# stable version 1.8 (branch gama-1-8-00 at cvs.sv.gnu.org) #
# #
#####################################################################
- Claudio Fontana: new complete build system, compatible with GNU
policies (as described in the GNU coding standards, and
technically also discussed in the autoconf, make and automake
manuals).
also added script scripts/autogen.sh
- new structure of source directories by Claudio Fontana. Directories
expat, gamalib, gnu_gama and matvec moved to a common source
subdirectory lib.
- fixed a bug in texinfo to produce DVI format correctly
- new implementation of graph connectivity
- removed obsolate constructors in adjustmen classes in directory
gnu_gama/adj/adj_*.h for formerly defined for diagonal weights
1.9.00 2006-03-03
#####################################################################
# #
# unstable version 1.9 (main trunk at CVS savannah.gnu.org) #
# #
#####################################################################
- merged changes from branch gama-1-8 (cvs update -j gama-1-8)
- fixed a bug in SparseMatrixGraph<Float>::connected(); the case
of a graph with no observations was not handled
- updated version of review.ru.lang by Anton Horpynich
1.8.01 2006-xx-xx
- added XML adjustment output for gama-local networks
- added new attribute 'epoch' in gama-local networks
- fixed a bug in SparseMatrixGraph<Float>::connected(); the case
of a graph with no observations was not handled
- updated xml/lang/ru/review.ru.lang
1.8.00 2005-12-28
#####################################################################
# #
# stable version 1.8 (branch gama-1-8-00 at cvs.sv.gnu.org) #
# #
#####################################################################
------------------------------------------------------------------------
- Anton Horpynich <[email protected]> translated gama-local *.lang
files to Ukraininan
- Anton Horpynich revied Russian translation of *.lang files
- added first draft of template class SparseMatrixGraph (this
version only tests cennectivity of a given sparse matrix' graph)
- fixed matvec/mavecbase,h
diff -r1.2 matvecbase.h
60c60
< void set_zero() { set_all(0.0); }
---
> void set_zero() { set_all(Float()); }
108c108
< return (x >= Float(0)) ? x : -x ;
---
> return (x >= Float()) ? x : -x ;
112c112
< return b >= 0.0 ? Abs(a) : -Abs(a);
---
> return b >= Float() ? Abs(a) : -Abs(a);
- added missing test for coordinates and vectors for huge abs. terms
in LocalNetwork::test_abs_term(Index)
1.7.14 2005-09-30
- fixed bug reported by Zoltan Faludi
Index: gamalib/local/median/g2d_coordinates.cpp
===================================================================
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 = 100;
+ const int max_depth = 5;
if(selected.empty() || (depth >= 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
===================================================================
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 = b.index_x();
-
out.width(IS->maxw_unk());
out << " " << " ";
out.width(IS->maxw_id());
@@ -88,13 +86,13 @@
else
out << " ";
prev_id = point_id;
- Double mx = IS->unknown_stdev(i);
- Double my = IS->unknown_stdev(i+1);
+ Double mx = IS->unknown_stdev(b.index_x());
+ Double my = IS->unknown_stdev(b.index_y());
mp = 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 = b.x()+x(i)/1000;
+ Double adj_x = 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 = y_sign*(b.y()+x(i+1)/1000);
+ Double adj_y = 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 = b.index_z();
-
if (!b.free_xy())
{
out.width(IS->maxw_unk());
@@ -156,7 +152,7 @@
prev_id = 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 = b.z()+x(i)/1000;
+ Double adj_z = 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 = IS->unknown_stdev(i);
+ double mz = 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
===================================================================
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=IS->PD.begin(); point!=IS->PD.end(); ++point)
if ((*point).second.free_xy())
- if (int i = (*point).second.index_x())
+ if ((*point).second.index_x())
{
const PointID point_id = (*point).first;
out.width(IS->maxw_id());
out << point_id.c_str() << ' ';
- Double my = IS->unknown_stdev(i);
- Double mx = IS->unknown_stdev(i+1);
+ const LocalPoint& p = (*point).second;
+ Double my = IS->unknown_stdev(p.index_y());
+ Double mx = IS->unknown_stdev(p.index_x());
Double mp = sqrt(my*my+mx*mx);
if (mp < 1000)
@@ -172,8 +173,8 @@
out << bk << ' ';
Double g = 0;
- Double dx = x( i );
- Double dy = y_sign*x(i+1);
+ Double dx = x( p.index_x() );
+ Double dy = y_sign*x( p.index_y() );
Double p1 = (dx*cos(alfa) + dy*sin(alfa));
Double p2 = (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
===================================================================
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
===================================================================
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 != GNU_gama::Exception::BadRegularization) throw;
- }
+ try
+ {
+ vyrovnani_();
+ }
+ catch(const MatVecException& vs)
+ {
+ if (vs.error != GNU_gama::Exception::BadRegularization) throw;
+
+ for (Index i=1; i<=sum_unknowns(); i++)
+ if (lindep(i))
+ {
+ const char type = unknown_type(i);
+ const PointID id = unknown_pointid(i);
+
+ LocalPoint& p = PD[id];
+ if (type == 'X' || type == 'Y' || type == 'R' )
+ {
+ p.unused_xy();
+ removed(id, rm_singular_xy );
+ }
+ else if (type == '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
===================================================================
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 = (obs->value() - df)*1e3;
size = 0;
- if (spoint.free_xy())
+ if (spoint.free_z())
{
if (!spoint.index_z()) spoint.index_z() = ++maxn;
index[ size ] = spoint.index_z();
coeff[ size ] = -1;
size++;
}
- if (tpoint.free_xy())
+ if (tpoint.free_z())
{
if (!tpoint.index_z()) tpoint.index_z() = ++maxn;
index[ size ] = tpoint.index_z();
1.7.13 2005-06-13
- added Cholesky decomposition as another adjustement algorithm
(template class AdjCholDec)
- removed unused method AdjBase<>::trwr()
- FSF's new address
find . -type f -exec sed -ie 's/59 Temple Place, Suite 330/51 Franklin
Street, Fifth Floor/;s/02111-1307/02110-1301/;' {} ';'
- three classes BaseOLS, OLSsvd and OLSgso (namespace GaMaLib,
directory gamalib/ls) renamed to AdjBase, AdjSVD and AdjGSO and
placed into the namespace GNU_gama (directory gnu_gama/adj).
From now there is no function, nor class, defined in the old
namespace GaMaLib referenced from the namespace GNU_gama.
Rather obsolete namespace GaMaLib is kept for the backward
compatibility and is mainly dedicated to the command line
program gama-local.
- matrix/vector template library moved to the directory 'matvec'
1.7.12 2005-03-27
- MatVec templete library moved to namespace GNU_gama
s/gMatVec/GNU_gama/g
- a bug in the output of coordiantes in the XML format
diff -r1.6 coordinates.h
68c68,69
< if (!b.active_xy()) continue;
---
> if (!b.active_xy() && !b.active_z()) continue;
>
- a bug in the second GSO constructor
80,83c80
< GSO(Mat<Float, Exc>& a, Index m, Index n)
< : pA(0), M(0), N(0), sc(true), tol_(0),
< minx_n(0), minx(0), clist(0), rlist(0)
< {
---
> GSO(Mat<Float, Exc>& a, Index m, Index n) : sc(true), tol_(0) {
122,125d118
< template <typename T> inline const T ABS(const T& x)
< {
< return (x >= T(0)) ? x : -x ;
< }
1.7.11 2004-09-02
- simplified version of GNU_gama::List<> template
- observation lists in gamalib/local/median rewritten to conform
the standard C++ library
- a lot of changes based on warnings reported by g++-3.4
- a bug in gkfparser.cpp reported by Jan Pytel
kwak$ diff gamalib/xml/gkfparser.cpp gkfparser.cpp.~1.16.~
58,59c58
< state == state_vectors_cov ||
< state == state_hdiffs_cov )
---
> state == state_vectors_cov )
- all occurrences of keyword 'class' in template type definitions
replaced by 'typeneme' (new gmatvec version 0.9.23)
- in the template class ObservationData (gnu_gama/obsdata.h) the
data member CL was renamed to 'clusters'
- first draft of zenith and azimuth angles in gama-g3 (NOT DEBUGGED YET!)
- gnu_gama/xml/dataparser.cpp split to three files dataparser.cpp,
dataparser_adj.cpp and dataparser_g3.cpp (corresponding to the
three functional modules)
1.6.02 2004-05-20 ****** stable version 1.6 ******
- CVS tag gama-1-6 moved to point to the current development branch
cvs tag -F gama-1-6
**********************
1.7.10 2004-05-01
- Catalan translation of gama-local by Diego Berge
- Hungarian translation of gama-local by Zoltan Faludi
- files statan.{h|cpp} and rand.{h|cpp} moved from gamalib to
gnu_gama
- bug in orientation of semimajor axes of error ellipses for
inconsistent coordinate systems (internally changed all y
coordinates to -y); see GaMaLib::Network::ErrorEllipses()
1.7.09 2004-04-07
- added new attribute zenith-angle-stdev="..." in the tag
<points-observations /> in gama-local input XML data
- added new parameter update-constrained-coordinates="yes | no"
into XML tag <parameters ... /> (input data for gama-local)
and all related changes in network.{h|cpp} and gkfparser.{h|cpp}
- added static data member 'bool gons' in GaMaLib::Observation
class to enable simple selection of output format in virtual
functions GaMaLib::Observation::write (this is a dirty hack but
I want to minimize changes in old GaMaLib)
The value of Observation::gons is set in gama-local on startup
by GaMaLib::Network functions set_gons() and/or set_degrees()
Implicit value of Observation::gons is true
- three bugs removed by Jan Pytel (approx. coordinates and new 360
degrees output):
* accord.cpp
* outlying_abs_terms.h
reduced_observations.h (reported by Zoltan Faludi)
- a bug in "active covariance matrix" in obsdata.h
--- obsdata.h-bug Thu Mar 18 11:57:06 2004
+++ obsdata.h Thu Mar 18 11:58:08 2004
@@ -345,8 +345,10 @@
const Index i_size = observation_list.size();
Index active_band = covariance_matrix.bandWidth();
- if (N && N-1 < active_band)
- active_band = N-1;
+ if (N)
+ {
+ if (N-1 < active_band) active_band = N-1;
+ }
else
active_band = 0;
- a bug in gkfparser.cpp reported by Jan Pytel (wrong error
message for "bad zenith anlge")
- gama-local: support for input of angular observables in 360
degrees (implicitly 400 grades)
- gama-local: optional output of adjustment results in degrees
(grades are used implicitly)
- scripts/gama_dep.cpp (1.01): added conditional usage of option
'-pipe' in makefiles generated for GNU Linux platform
bc++ compiler from Kylix3 can now use the makefiles generated in
the project for GNU compilers