From: <tom...@us...> - 2010-06-23 23:30:49
|
Revision: 1280 http://panotools.svn.sourceforge.net/panotools/?rev=1280&view=rev Author: tomaszmeger Date: 2010-06-23 23:30:42 +0000 (Wed, 23 Jun 2010) Log Message: ----------- - new simple tool for testing with parser - parser.pl (basic version) - improved documentation and added some comments - removed interpolators test from cmake testing process - parameters tests don't need anymore separate files (now they are generated automatically) - code improvements - other less important changes Modified Paths: -------------- branches/libpano_gsoc2010_regtests/tests/gsoc/compare.pl branches/libpano_gsoc2010_regtests/tests/gsoc/f1/CMakeLists.txt branches/libpano_gsoc2010_regtests/tests/gsoc/gen.pl branches/libpano_gsoc2010_regtests/tests/gsoc/resizer.pl branches/libpano_gsoc2010_regtests/tests/gsoc/resizer2.pl branches/libpano_gsoc2010_regtests/tests/gsoc/runTest.pl Added Paths: ----------- branches/libpano_gsoc2010_regtests/tests/gsoc/parser.pl Removed Paths: ------------- branches/libpano_gsoc2010_regtests/tests/gsoc/f0/test_param_0.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f0/test_param_1.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/test_param_0.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/test_param_1.txt Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/compare.pl =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/compare.pl 2010-06-21 16:22:41 UTC (rev 1279) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/compare.pl 2010-06-23 23:30:42 UTC (rev 1280) @@ -4,11 +4,15 @@ use Pod::Usage; use Switch; - -my $path = shift or pod2usage( -verbose => 2 ); my $method = 1; +my $help = 0; +GetOptions ('m|method=i' => \$method, + 'h|help' => \$help); +pod2usage (-verbose => 2) if $help; +pod2usage (2) unless scalar @ARGV > 1; + my @location = split( '/', $path ); my $fileName = $location[-1]; $location[-1] = ''; @@ -48,10 +52,27 @@ =head1 SYNOPSIS - compare project.txt + compare.pl [options] project.txt + Options: + -h | --help Outputs help documentation. + -m | --method Method of cmp. Use + 0 for basic compare, + 1 for comparing with absolute error, + 2 for difference method, + 3 for, + 4 for tiffcmp =head1 DESCRIPTION +B<compare.pl> takes PTSticher *.txt script and compares images from reference +directory with images in test directory. Currently it has 5 different methods of +comparing including: +- +- +- +- +- + =head1 LICENSE Deleted: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/test_param_0.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f0/test_param_0.txt 2010-06-21 16:22:41 UTC (rev 1279) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/test_param_0.txt 2010-06-23 23:30:42 UTC (rev 1280) @@ -1,8 +0,0 @@ -# PTStitcher script, written by hugin - -p f0 w233 h321 v72 n"TIFF_m c:NONE" -m g1 i0 f0 m2 p0.00784314 - -# output image lines -o w233 h350 f0 TrX0 TrY0 TrZ0 a0 b0 c0 d0 e0 g0 p29.5811 r-1.27138 t0 v72.2213 y0 u10 m0 n"./060720_6556_scaled.jpg" - Deleted: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/test_param_1.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f0/test_param_1.txt 2010-06-21 16:22:41 UTC (rev 1279) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/test_param_1.txt 2010-06-23 23:30:42 UTC (rev 1280) @@ -1,8 +0,0 @@ -# PTStitcher script, written by hugin - -p f0 w233 h321 v72 n"TIFF_m c:NONE" -m g1 i0 f0 m2 p0.00784314 - -# output image lines -o w233 h350 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p29.5811 r-1.27138 t0 v72.2213 y0 u10 m0 n"./060720_6556_scaled.jpg" - Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/f1/CMakeLists.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f1/CMakeLists.txt 2010-06-21 16:22:41 UTC (rev 1279) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f1/CMakeLists.txt 2010-06-23 23:30:42 UTC (rev 1280) @@ -5,6 +5,6 @@ add_test(simple_f2 ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-t -s" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") add_test(formats ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-f -s" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") #add_test(parameter_f1 ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-a -s" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") -add_test(intanti ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-i -s" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(intanti ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-i -s" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") add_test(projections ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-p -s" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") Deleted: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/test_param_0.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f2/test_param_0.txt 2010-06-21 16:22:41 UTC (rev 1279) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f2/test_param_0.txt 2010-06-23 23:30:42 UTC (rev 1280) @@ -1,8 +0,0 @@ -# PTStitcher script, written by hugin - -p f3 w268 h134 v106.4 n"TIFF_m c:NONE r:CROP" -m g1 i0 f0 m2 p0.00784314 - -# output image lines -o w584 h876 f2 TrX0 TrY0 TrZ0 a0 b0 c0 d0 e0 g0 p0 r0 t0 v106.445 y0 u10 m0 n"./IMG_4117_scaled.jpg" S-144,710,6,862 - Deleted: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/test_param_1.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f2/test_param_1.txt 2010-06-21 16:22:41 UTC (rev 1279) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f2/test_param_1.txt 2010-06-23 23:30:42 UTC (rev 1280) @@ -1,8 +0,0 @@ -# PTStitcher script, written by hugin - -p f3 w268 h134 v106.4 n"TIFF_m c:NONE r:CROP" -m g1 i0 f0 m2 p0.00784314 - -# output image lines -o w584 h876 f2 TrX0 TrY0 TrZ0 a0.0211588 b-0.0688439 c0.0291346 d-36.373 e-14.9898 g0 p0 r0 t0 v106.445 y0 u10 m0 n"./IMG_4117_scaled.jpg" S-144,710,6,862 - Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/gen.pl =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/gen.pl 2010-06-21 16:22:41 UTC (rev 1279) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/gen.pl 2010-06-23 23:30:42 UTC (rev 1280) @@ -27,6 +27,7 @@ $testParameter = 1; $testIntAnti = 1; $testProjections = 1; + $testSimple = 1; } elsif (/-f/) { $testFormats = 1; @@ -62,7 +63,6 @@ print "Input script doesn't exist.\n"; pod2usage( -verbose => 2 ); } - } } @@ -94,9 +94,8 @@ 'psd_mask' => "\"PSD_mask\"", ); - my $pto = new Panotools::Script; - logIt("Reading input file for interpolators and antialising testing"); - $pto->Read($pto_in); +my $pto = new Panotools::Script; +$pto->Read($pto_in); my @projections = ( ['rectilinear', 0, 110, 110, $pto->Panorama->{w}, $pto->Panorama->{w}], @@ -162,7 +161,7 @@ open( FILE, "+< " . $test_path ) or die $!; while (<FILE>) { if (/^p/) { - $_ =~ s/E0 R0//; + $_ =~ s/E0 R0 //; } elsif (/^i/) { $flag = 1; @@ -258,6 +257,39 @@ logIt("Testing formats finished"); } +#left only first image from the script +sub left1st { + my ($script) = @_; + my $output = ""; + open( FILE, "+< $script") or die $!; + while (<FILE>) { + if (/^p/) { + $_ =~ s/E0 R0 //; + } + elsif (/^i/ || /^o/) { + $output = $output . $_; + last; + } + $output = $output . $_; + } + close FILE or die $!; + open( FILE, "> test_$script" ) or die $!; + print FILE $output; + close FILE or die $!; +} + +#setting path to the images +sub setImagesLoaction { + my ($pto) = @_; + my $pwd = `pwd`; + chomp($pwd); + for my $image ( @{ $pto->Image } ) { + my @location = split( '/', $image->{n} ); + $image->{n} = ( '"' . $pwd . '/' . $location[-1] ); + } + #return $pto; +} + #parameter testing sub parameter { my ($pto_in) = @_; @@ -266,10 +298,25 @@ logIt("Reading input file for parameters testing"); logIt("Testing parameters: a, b, c, d, e, g, t"); - - my @params = ('a', 'b', 'c', 'd', 'e', 'g', 't'); - my $paramZero = 0; + my @params = ('a', 'b', 'c', 'd', 'e', 'g', 't'); + + #creating 2 new files one with all param eq to zero + #and one with normal param form the given input script + `cp $pto_in test_param_0.txt`; + `cp $pto_in test_param_1.txt`; + $pto->Read("test_param_0.txt"); + $pto1->Read("test_param_1.txt"); foreach my $param (@params) { + $pto->Image->[0]->{$param} = 0; + } + setImagesLoaction($pto); + setImagesLoaction($pto1); + $pto->Write("test_param_0.txt"); + left1st("test_param_0.txt"); + left1st("test_param_1.txt"); + + #testing param + foreach my $param (@params) { $pto->Read("test_param_0.txt"); $pto1->Read("test_param_1.txt"); @@ -328,7 +375,7 @@ $pto1->Image->[0]->{$param} = $normal; $test_path = "tests/param/param_$param\_11.txt"; $pto1->Write($test_path); - PTmenderAdapt($test_path); + PTmenderAdapt($test_path); runTest($test_path); unless ($leftScript) { `rm -f $test_path`; @@ -472,15 +519,35 @@ =head1 NAME -gen +gen.pl - generate tests, run tests and compare output to the +reference =head1 SYNOPSIS - gen project.txt +gen.pl [options] <script_file> + Options: + -r creates new reference + -f tests formats + -a tests parameters + -i tests interpolators and antialising + -p tests projections + -t running simple test + -s left generated scripts after testing + -c turns off comparing + -A run all kind of tests + =head1 DESCRIPTION +B<gen.pl> takes a PTsticher *.txt script and generates a new script or scripts, +that tests specific PTmender functionality. +The main task of B<gen.pl> is to generate new tests for PTmender, including +format testing, parameters testing, interpolators and antialiasing testing, +projection testing. B<gen.pl> is also responsible for execute those tests, +execute other not automatically generated tests, making a new reference files +if necessary. + =head1 LICENSE This program is free software; you can redistribute it and/or Added: branches/libpano_gsoc2010_regtests/tests/gsoc/parser.pl =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/parser.pl (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/parser.pl 2010-06-23 23:30:42 UTC (rev 1280) @@ -0,0 +1,270 @@ +#!/usr/bin/perl +use strict; +use warnings; +use Panotools::Script; +use Pod::Usage; +use Time::HiRes qw[gettimeofday tv_interval]; +use Digest::SHA1 qw(sha1_base64); + +my $pto_in = "test.txt"; + +#start of logging +open( LOG, "> tests.log" ) or die $!; +my @months = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); +my @weekDays = qw(Sun Mon Tue Wed Thu Fri Sat Sun); +my ( + $second, $minute, $hour, + $dayOfMonth, $month, $yearOffset, + $dayOfWeek, $dayOfYear, $daylightSavings +) = localtime(); +my $year = 1900 + $yearOffset; +my $theTime = +"$hour:$minute:$second, $weekDays[$dayOfWeek] $months[$month] $dayOfMonth, $year"; +logIt( "New test: " . $theTime ); + +my %formats = ( + 'jpeg' => "\"JPEG q100 g01\"", + 'tiff_none' => "\"TIFF c:NONE\"", + 'tiff_lzw' => "\"TIFF c:LZW\"", + 'tiff_deflate' => "\"TIFF c:DEFLATE\"", + 'tiff_m' => "\"TIFF_m\"", + 'tiff_mask' => "\"TIFF_mask\"", + 'tiff_m_cropped' => "\"TIFF_m r:CROP\"", + 'tiff_m_uncropped' => "\"TIFF_m r:UNCROP\"", + 'psd' => "\"PSD\"", + 'psd_nomask' => "\"PSD_nomask\"", + 'psd_mask' => "\"PSD_mask\"", +); + + my $pto = new Panotools::Script; + $pto->Read($pto_in); + +my @projections = ( + ['rectilinear', 0, 110, 110, $pto->Panorama->{w}, $pto->Panorama->{w}], + ['cylindrical', 1, 360, 115, $pto->Panorama->{w}, $pto->Panorama->{h}], + ['equirectangular', 2, 360, 180, $pto->Panorama->{w}, $pto->Panorama->{h}], + ['fisheye', 3, 360, 180, $pto->Panorama->{w}, $pto->Panorama->{h}], + ['stereographic', 4, 180, -1, $pto->Panorama->{w}, $pto->Panorama->{h}], + ['mercator', 5, 360, 133, $pto->Panorama->{w}, $pto->Panorama->{h}], + ['transverseMercator', 6, 133, -1, $pto->Panorama->{h}, $pto->Panorama->{w}], + ['sinusoidal', 7, 360, 180, $pto->Panorama->{w}, $pto->Panorama->{h}], + ['lambertCylindrical', 8, 360, -1, $pto->Panorama->{w}, $pto->Panorama->{h}], + ['lambertAzimuthal', 9, 360, -1, $pto->Panorama->{w}, $pto->Panorama->{h}], + ['albersEqualAreaConic', 10, 360, -1, $pto->Panorama->{w}, $pto->Panorama->{h}], + ['miller', 11, 360, 145.6, $pto->Panorama->{w}, $pto->Panorama->{h}], + ['pannini', 12, 180, 76.3, $pto->Panorama->{w}, $pto->Panorama->{h}], + ['architectural', 13, 360, 103.5, $pto->Panorama->{w}, $pto->Panorama->{h}*0.5], + ['orthographic', 14, 180, -1, $pto->Panorama->{w}, $pto->Panorama->{w}], + ['equisolid', 15, 360, -1, $pto->Panorama->{w}, $pto->Panorama->{w}], + ['equirectangularPanini', 16, 300, 150, $pto->Panorama->{w}, $pto->Panorama->{h}], + ['biplane', 17, 200, 132.5, $pto->Panorama->{w}, $pto->Panorama->{h}], + ['triplane', 18, 200, 90, $pto->Panorama->{w}, $pto->Panorama->{h}], +); + +unless ( -d "tests" ) { + mkdir( "tests", 0755 ) || print $!; + logIt("Created new folder: tests"); +} + +start($pto); +compare("test_results.txt", "reference_results.txt"); + +print "All selected tests are done\n"; +close(LOG); + +#functions + +sub start { + my ($pto) = @_; + my $description = ""; + `rm -f test_results.txt`; + projections($pto, $description) +} + +sub test { + my ($pto, $description) = @_; + $description = $description . "hash: "; + my $path = "tests/parser/tmp.txt"; + unless ( -d $path) { + mkdir("tests/parser/"); + } + $pto->Write($path); + PTmenderAdapt($path); + my $output = `../../../tools/PTmender -o tmp $path`; + $output = sha1_base64($output); + `rm -f tmp*.*`; + my $resultsPath="test_results.txt"; + open(FILE,">>$resultsPath") || die("Cannot Open File $resultsPath"); + print FILE $description.$output."\n"; + close FILE or die $!; + $description = ""; +} + +sub compare { + my ($path1, $path2) = @_; + open(FILE1,$path1) || die("Cannot Open File $path1"); + open(FILE2,$path2) || die("Cannot Open File $path2"); + while (<FILE1>) { + my $out1 = $_; + while (<FILE2>) { + my $out2 = $_; + my ($out1_pre,$out1_post) = split(/ /,$out1); + my ($out2_pre,$out2_post) = split(/ /,$out2); + if ( $out1_pre eq $out2_pre ) { + #found test + print "Comparing $out1_pre: "; + if ( $out1_post eq $out2_post ) { + print "OK\n"; + } + else { + print "NOT OK\n"; + } + } + } + } +} + +sub projections { + my ($pto, $description) = @_; + for ( my $i = 0 ; $i <= $#projections ; $i++ ) { + $description = $description . $projections[$i][0] ."_"; + $pto->Panorama->{f} = $projections[$i][1]; + $pto->Panorama->{v} = $projections[$i][2]; + $pto->Panorama->{w} = $projections[$i][4]; + $pto->Panorama->{h} = $projections[$i][5]; + formats($pto, $description); + } +} + +sub formats { + my ($pto, $description) = @_; + my ( $key, $format ); + while ( ( $key, $format ) = each(%formats) ) { + $description = $description . $key ."_"; + $pto->Panorama->{n} = $format; + test($pto, $description); + #interpolator($pto); + } + +} + +sub interpolator { + my ($pto) = @_; + for ( my $i = 0; $i < 23; $i++ ) { + $pto->Mode->{i} = $i; + paramA($pto); + } +} + +sub paramA { + my ($pto) = @_; + for ( my $i = 0.0; $i <= 2.0; $i += 0.1 ) { + $pto->Image->[0]->{a} = $i; + paramB($pto); + } +} +sub paramB { + my ($pto) = @_; + for ( my $i = 0.0; $i <= 2.0; $i += 0.1 ) { + $pto->Image->[0]->{b} = $i; + paramC($pto); + } +} +sub paramC { + my ($pto) = @_; + for ( my $i = 0.0; $i <= 2.0; $i += 0.1 ) { + $pto->Image->[0]->{c} = $i; + paramD($pto); + } +} +sub paramD { + my ($pto) = @_; + for ( my $i = 0.0; $i <= 2.0; $i += 0.1 ) { + $pto->Image->[0]->{d} = $i; + paramE($pto); + } +} +sub paramE { + my ($pto) = @_; + for ( my $i = 0.0; $i <= 2.0; $i += 0.1 ) { + $pto->Image->[0]->{e} = $i; + paramG($pto); + } +} +sub paramG { + my ($pto) = @_; + for ( my $i = 0.0; $i <= 2.0; $i += 0.1 ) { + $pto->Image->[0]->{g} = $i; + paramT($pto); + } +} +sub paramT { + my ($pto) = @_; + for ( my $i = 0.0; $i <= 2.0; $i += 0.1 ) { + $pto->Image->[0]->{t} = $i; + } +} + +#resolving problem with E0 R0, removing unnecessary lines +sub PTmenderAdapt { + my ($test_path) = @_; + my $flag = 0; + my $output = ""; + open( FILE, "+< " . $test_path ) or die $!; + while (<FILE>) { + if (/^p/) { + $_ =~ s/E0 R0//; + } + elsif (/^i/) { + $flag = 1; + } + elsif ($flag) { + last; + } + $output = $output . $_; + } + close FILE or die $!; + open( FILE, "> " . $test_path ) or die $!; + print FILE $output; + close FILE or die $!; +} + + +#log +sub logIt { + my ($logText) = @_; + $logText = $logText . "\n"; + print LOG $logText; +} + + + +__END__ + +=head1 NAME + +allGen + +=head1 SYNOPSIS + + perl allGen.pl + +=head1 DESCRIPTION + + +=head1 LICENSE + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +=head1 SEE ALSO + +L<http://hugin.sourceforge.net/> + +=head1 AUTHOR + +Tomasz Meger - June 2010. + +=cut Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/resizer.pl =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/resizer.pl 2010-06-21 16:22:41 UTC (rev 1279) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/resizer.pl 2010-06-23 23:30:42 UTC (rev 1280) @@ -79,6 +79,7 @@ =head1 DESCRIPTION +Used for resizing images in pto project. Using scale to resize. =head1 LICENSE Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/resizer2.pl =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/resizer2.pl 2010-06-21 16:22:41 UTC (rev 1279) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/resizer2.pl 2010-06-23 23:30:42 UTC (rev 1280) @@ -80,6 +80,7 @@ =head1 DESCRIPTION +Used for resizing images in pto project. Using common denominators to resize. =head1 LICENSE Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/runTest.pl =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/runTest.pl 2010-06-21 16:22:41 UTC (rev 1279) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/runTest.pl 2010-06-23 23:30:42 UTC (rev 1280) @@ -65,10 +65,12 @@ =head1 SYNOPSIS - runTest.pl [-rp] <script> + runTest.pl [-r] <script> =head1 DESCRIPTION +Used for running testing script, moving results to correct place, creating +directories if they don't exist. =head1 LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tom...@us...> - 2010-06-27 23:10:01
|
Revision: 1281 http://panotools.svn.sourceforge.net/panotools/?rev=1281&view=rev Author: tomaszmeger Date: 2010-06-27 23:09:54 +0000 (Sun, 27 Jun 2010) Log Message: ----------- in parser.pl: - added possibility for generating combined tests - combine all parameters functions into one - reference files will be extended if result won't be found - improved documentation and added some comments - code improvements - other less important changes in other files: - added 64 new tests into cmake (16 are removed due to time they take) - added reference files for new tests Modified Paths: -------------- branches/libpano_gsoc2010_regtests/tests/gsoc/f0/CMakeLists.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f1/CMakeLists.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/CMakeLists.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f3/CMakeLists.txt branches/libpano_gsoc2010_regtests/tests/gsoc/parser.pl Added Paths: ----------- branches/libpano_gsoc2010_regtests/tests/gsoc/f0/parser_reference.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f1/parser_reference.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/parser_reference.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f3/parser_reference.txt Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/CMakeLists.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f0/CMakeLists.txt 2010-06-23 23:30:42 UTC (rev 1280) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/CMakeLists.txt 2010-06-27 23:09:54 UTC (rev 1281) @@ -6,3 +6,20 @@ add_test(parameter_f0 ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-a -s" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") #add_test(projections ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-p -s" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#parser tests +add_test(parser_f0_formats ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "f" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f0_projections ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "p" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(parser_f0_interpolators ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "i" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f0_a ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "A" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f0_b ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "B" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f0_c ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "C" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f0_d ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "D" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f0_e ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "E" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f0_g ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "G" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f0_t ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "T" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") + +#additional parser tests (takes much more time) +#add_test(parser_f0_a_b_c ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "ABC" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(parser_f0_d_e ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "DE" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(parser_f0_g_t ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "GT" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(parser_f0_projections_and_formats ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "pf" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/parser_reference.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f0/parser_reference.txt (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/parser_reference.txt 2010-06-27 23:09:54 UTC (rev 1281) @@ -0,0 +1,338 @@ +a-1_b-1_c-1_ YtJbnR+nu8XmeaI2MGoxYhto/HU +a-1_b-1_c-0.3_ hKqwnamZSGicH/dAylSdVR+scjg +a-1_b-1_c0.4_ mXav6e2bdq8RRXTojKCAH2q6v+4 +a-1_b-1_c1.1_ IHoJSbTJcLg58pvVbJPZdaGe24A +a-1_b-0.3_c-1_ Pdlk8LF8MJtEcYtYp1RisMgKm8M +a-1_b-0.3_c-0.3_ qyboM+jHKOsK0SZZqARbRxaSRyM +a-1_b-0.3_c0.4_ Kz522UKRIcxRoQyTgCo6NfB+To8 +a-1_b-0.3_c1.1_ o8MaChukdbAZ/+aiXEOnz79tADE +a-1_b0.4_c-1_ q+CCyizmMfKBiU19ztwepOIp8kE +a-1_b0.4_c-0.3_ IiummfVtw7qFu6Bcn0QzULQ6Lvo +a-1_b0.4_c0.4_ 6YURikB4iktJbhIYbhLUo2TZdzU +a-1_b0.4_c1.1_ 1NgxWglONCbOFGb/dr58IwPAvfQ +a-1_b1.1_c-1_ L+g32XmN1E4vH2ByixsBjaB9Jwk +a-1_b1.1_c-0.3_ yhHUGD1fvZsJXlB+qLfAkIQysZ4 +a-1_b1.1_c0.4_ N8BnT4EzNJ/BWUpE6BJE8lK2yos +a-1_b1.1_c1.1_ Trv1xeOLjnEH+rLfxtI+oQ/5srA +a-0.3_b-1_c-1_ fvSxfc+Pwf9fHCy4acBUoQ2QJZI +a-0.3_b-1_c-0.3_ lrqbomJKRwr76Ql8xvUU0Xq+xaU +a-0.3_b-1_c0.4_ mo/X9S6SfW4WurvyWbnizBq/uhU +a-0.3_b-1_c1.1_ Awo2TEe36CJlLKZDhf02vvXqYnM +a-0.3_b-0.3_c-1_ ok2zCp3AC8YnGi1Mr9GRBUv48pU +a-0.3_b-0.3_c-0.3_ uYvOQvKi9J0EPQ/QuONmqF0dYyg +a-0.3_b-0.3_c0.4_ YDbjOJgXeQfsrGOcT+WVPROWoUc +a-0.3_b-0.3_c1.1_ +csYQeAXwU6l4lwDPs252RTV1PA +a-0.3_b0.4_c-1_ 8DqiP1Tx2PcQf5y3oJuO+sNCFRo +a-0.3_b0.4_c-0.3_ k6hebQ54q96pVWUBLfCYzYGXapI +a-0.3_b0.4_c0.4_ 19eIIRiT0uaTUEUZ8vHRSBPQBTo +a-0.3_b0.4_c1.1_ Wg3iK1tmKT5bBV4Mkq3FVE4zQQY +a-0.3_b1.1_c-1_ 7OAR9Ia6MJHhOGIPUeN3oSCFtQk +a-0.3_b1.1_c-0.3_ jjXotdnzu4lFwECVr5nnMvlVcyw +a-0.3_b1.1_c0.4_ +yQYHAAoCjWxnq07jDZ3QtvdZRk +a-0.3_b1.1_c1.1_ hOpZkIqvxlpHYe5FdcrBa8f1gTE +a0.4_b-1_c-1_ eic5npKLKT2/LHNcpFkm8S9CVgw +a0.4_b-1_c-0.3_ jPZgmvOew1SEL0cM6v6lk7AR6gM +a0.4_b-1_c0.4_ caf3EYMPSRUg0Ir3zQtp3CxTOdQ +a0.4_b-1_c1.1_ CQYwV1LU8TfN4EKCzOprQEAnIhM +a0.4_b-0.3_c-1_ RTv/OPfJ+qwt0v8C2kGR8xR2e9w +a0.4_b-0.3_c-0.3_ iNuwvqrPRPKRk0d8PCeZ+2C+a3Q +a0.4_b-0.3_c0.4_ +nWsfKdV4QbC1pG6cgbgSfBXpVw +a0.4_b-0.3_c1.1_ bAo9jFBoeKFW2j/OR0rT67QEE18 +a0.4_b0.4_c-1_ w/zOOlkpYUL9wkMb4qGrR3HGWaU +a0.4_b0.4_c-0.3_ YLya9gl8wNEXxP2Cjq+vBnXEwC8 +a0.4_b0.4_c0.4_ h9XVc7bhuZM8SD3yULwyqhCnupY +a0.4_b0.4_c1.1_ KFZhs7UruqsfKtYu0w1kkQvhmhI +a0.4_b1.1_c-1_ APdHDaSV2lZS5Xl/YTmkRyxq30o +a0.4_b1.1_c-0.3_ j6CtQCCCQw614nezexEBsVTAOWY +a0.4_b1.1_c0.4_ 05jtCb0YUMJ/OFuG5q2kqY7jq+s +a0.4_b1.1_c1.1_ 6Ce0o3hsYZIysOZz9xggMnmzcu8 +a1.1_b-1_c-1_ sDHULrJZQxHPJc85gbp+FOr+MBI +a1.1_b-1_c-0.3_ SEyqGhNSPxFoLwMCIGiib8ORADU +a1.1_b-1_c0.4_ u+CojskmNINVR86/QO+q04l8rxk +a1.1_b-1_c1.1_ ihJd+8wuEtuc/6E1MZbum+AQoFc +a1.1_b-0.3_c-1_ XsoReIsf9bQTEz/Ssd/DxvPaujI +a1.1_b-0.3_c-0.3_ zjVWc59WWWuakDOHQt0zVQD1mi4 +a1.1_b-0.3_c0.4_ AU0O3VZro1vXLCSsgogcGxGu7ig +a1.1_b-0.3_c1.1_ xzHZTQvgDRxKEaEcu6YLqeZxbHc +a1.1_b0.4_c-1_ eLomcXlytTaLdR8Y3PGhGmef9RE +a1.1_b0.4_c-0.3_ 5qvdhaXCHaws54N5fY+jlrsIIOQ +a1.1_b0.4_c0.4_ c8We8fDIEKN/0GbRtaP2NuStMlg +a1.1_b0.4_c1.1_ hTp27QTjrB6nIdx1rub+jRJbLow +a1.1_b1.1_c-1_ 8OdniZ+K7eeRFvLY+aaQdm9dgwM +a1.1_b1.1_c-0.3_ /uWOEN4nDSdoNmNyiFcKPvBUj1g +a1.1_b1.1_c0.4_ 6vPxHmcOwwAxElYVnXvDnA3+Mq8 +a1.1_b1.1_c1.1_ eX6gP9xIOhupzhO6jpUxfMyiKTY +d-1_e-1_ R2e6AA3XkAYr+VoF6CIpksf3nEM +d-1_e-0.3_ faRJbDK7PamX96wN3IKJO3cctYs +d-1_e0.4_ 1ibTAEIh1HSWS7vDsXAGklhPgzI +d-1_e1.1_ MyQ8UIpXn0F7XqfT37hUXtY65E0 +d-0.3_e-1_ HP2J+Ly5DmH5dzO+V3QQ7PxbAms +d-0.3_e-0.3_ Jw45ZLfKvdJrIuFJ8Fm21nEqyYA +d-0.3_e0.4_ lmQBg8hHKDO32CmvWe7pLxL5WpM +d-0.3_e1.1_ 08G00kHm4yZyp+3RATxUN+bAaGM +d0.4_e-1_ ee7cHr7B9kvxcqvz6g8NxZG2C+A +d0.4_e-0.3_ RFOKFw0c2Wbjv8NTfcG2jsaI2Ow +d0.4_e0.4_ cTYBDfzyAQrn39XnonXTJU167ZY +d0.4_e1.1_ lHIW29MghGydrs+VT3oh5ZcAsto +d1.1_e-1_ 11guqLb8KDyWwn2Y7JtDhhcovp4 +d1.1_e-0.3_ WUpQrBfOCvkqe3PBwM5qsxQuaHM +d1.1_e0.4_ ixOSstPQTshsWNx+0Re9N7ibSLs +d1.1_e1.1_ 2OU95RPTuqRpvLLpNC6i5yBvrXg +g-1_t-1_ jB2Myz6dQN+f6ngZ7r0LcMcngPQ +g-1_t-0.3_ W9enPE3WWWHX94sbTH1Eiq2H8u8 +g-1_t0.4_ +X2+7MYxasR0Wu+a9LE4OUU8QGU +g-1_t1.1_ O5O/Z0waznPD089emW2W722Pg5I +g-0.3_t-1_ dsBSZ85dHkxSC3UyTjYyIbZgKzs +g-0.3_t-0.3_ bnnZlG4hK0HNJaPt5rKS+7UPUnI +g-0.3_t0.4_ SksdCzFc9qnyk/0VfNdYa5k6Xb4 +g-0.3_t1.1_ cA27MSSKAmtbtV6Nk+frbZzf7hM +g0.4_t-1_ bo76QUDd2qz2LhcQOTJTU+lqcfA +g0.4_t-0.3_ 5xNLzkJr7rt6vSCu9RiHISD4aJg +g0.4_t0.4_ sOLL0rPb7Ryft0ltgz7SdCZ+Izw +g0.4_t1.1_ 4vh6/RM4BpWIWdtaGxWIYUAX33Y +g1.1_t-1_ MKuo4vkjsQXnNL1AIDA6cjof26Q +g1.1_t-0.3_ Ytz2vjPLZ2xBlnfypSaRp0iOjnw +g1.1_t0.4_ ocOjpNOmgE4MsFy0aq8uxg7/1lA +g1.1_t1.1_ q7owSCljlxnQ8BYj6jhY3kbccXM +i0_ GQ+uex1P3Jz0CswkNeuecZJemwY +i1_ ychrOKAtcmOu23Qc5dlUaT/9mSM +i2_ YZFePjcmJOLy7VmFZGoNSSqiTuw +i3_ N2vi7bfynqM7hB54PWiDoozeKvU +i4_ O5fIATBsZHsEbM3DKjrQolumYyI +i5_ LU2HsKE8YgqlIU+tizcxC66sld4 +i6_ yCY0Y+aa8i1CSriW65CKsrbHW0Y +i7_ VCPWN7yBJepuNZewJb7T9Ew4WDM +i8_ 6eQovvl04PowmiLWKhW6ENubKfE +i9_ SZ4YQwUsEZ7bIhadJepjBEliFXQ +i10_ HpxPhZpn84sDPV65Ssa0HwBTJ5M +i11_ ER9P9C42FJbOK6EO/mCjl2jcjbs +i12_ dxHk6EVvzWoIjMiObBKURte7UPA +i13_ dPOlIeHtLKLOOLH4lzaqFOUnlNg +i14_ zfbt2M1J28NZEYvi8jozKIx//c0 +i15_ HOO1bsAeXf6FX8T3ioC8MieQq5I +i16_ pVbelNHkGkHwtELpnIdeSBlRWSQ +i17_ Q3IMOH2nM6iWvCVqaNEtwWpq9K4 +i18_ CZ87GSbnAyLWvhVzzlquos5nWg4 +i19_ zV1FBEGLj/6s4YWeuATP9H/OsKs +i20_ WntUaQ+YEtUSqLWZ0OmCFLHpj84 +i21_ TDiZQgI9qmX3Hy9bRKqHb7XkLoQ +i22_ 3867379hwPsHX/5gFFNeXlXi5o0 +tiff_lzw_ 4RA+UNwV1/Sh/iyDcqsw910oC5k +tiff_deflate_ 44cURQmay/xvYBK42CvSKZpO1HE +psd_mask_ 8+Mbi9L8SFFqHD9reoSZQGZeWgY +psd_nomask_ 07yBuTYz2+CvmzJ25hB/bExmIH8 +tiff_m_uncropped_ GOpwVNvXRvYPF43ftwQt8H1X72U +tiff_m_ IzGSS3ISKPeLlzW02CshIlg9Yk8 +psd_ 8ApcFVtv6+KjN1409M+Qj5kybFE +tiff_none_ rDL+P8lIeWrmZGvQf5rkbaQYHs4 +tiff_mask_ naWepxIuDbCPE9qzNy+LK1MGFgE +jpeg_ Ka5QDZC7c105SfM4jnav/0Cvp6o +tiff_m_cropped_ sYNlbIsH1jOKdw8tWRhjWzdy9ak +rectilinear_ 1fKYM2yOUoexbMmRigN7mcDEDgk +cylindrical_ D6w+nPDL0GnQfxdufa3JnRoDfc4 +equirectangular_ GQ+uex1P3Jz0CswkNeuecZJemwY +fisheye_ 1UuODwfxVd7TSx8DZ9PXnjn8khI +stereographic_ G1zjGGomWxLL5rTmsC74q/nzRus +mercator_ D0it6xZKLvBgL2uqMVv+KJznkCA +transverseMercator_ 21+IM1/8k2TgySnTiJUMzadd+Hc +sinusoidal_ Gok7kcokiWO13KDpBTICbIWoin4 +albersEqualAreaConic_ O7d8ENPMgELJrfcnjfJqF8hUC6s +miller_ P0gjoQ8KBM4r+/yje4gOco2hR3g +pannini_ Va4WzQ9XMxWJXmR9y9ry4nGj+Wc +architectural_ P0ySW9bekxhrBz2w31VBE64T8vw +orthographic_ Hv3wVO4bb6zWyfjYv4RMGO+eAf8 +equirectangularPanini_ R3A6zgnW1QbvIj3hthGdjveMswM +biplane_ tDc+8jMmtmdJisBtcY+Xv2BbgEw +rectilinear_tiff_lzw_ J2n/1cSAtamApa3HXbLUoAX8E+I +rectilinear_tiff_deflate_ OmZpCuIghBjmpXbfqojY16+y3EA +rectilinear_psd_mask_ Sl7BrNOf9ylEBdB1xJoZ1AQLbZw +rectilinear_psd_nomask_ bMpVD73T9jkYTlMkpLL/Ki69H64 +rectilinear_tiff_m_uncropped_ gFrU4zKJjSydK+PG15B6XPGNHXQ +rectilinear_tiff_m_ rwFzfciDAafFo/o9mmTiYbAoLm0 +rectilinear_psd_ DP6tiAwzR7PZjI7kygcuQzNjOI0 +rectilinear_tiff_none_ K1v+rNfi26a16Te45aLjwJXTyJc +rectilinear_tiff_mask_ o1lNHRUVKPwXfRC9gNmI4fbmdzc +rectilinear_jpeg_ Z2lhCVi/ogt7Tjx9Gn8iBwVacCU +rectilinear_tiff_m_cropped_ 0UiNyUbSSINUKCMRbR0X4S+M5Nw +cylindrical_tiff_lzw_ IG7C5MZJKWA1TomTrk2sZnURu/I +cylindrical_tiff_deflate_ JEchY0aSABWtaqfA/ml5LgwcrWE +cylindrical_psd_mask_ rh6/fnAtgXu3KOy58iW6REkGL9k +cylindrical_psd_nomask_ dI+vXBdBulh8naYgsqAuIrZC5qg +cylindrical_tiff_m_uncropped_ M8+xQnfQ5T/d653yzTsrufUJBqg +cylindrical_tiff_m_ zAdia7MTtPfIAyw8BN4HbY2+FUo +cylindrical_psd_ TCVqDeMsSau9oT4zMKTp7BNqar0 +cylindrical_tiff_none_ XZcnf6My07Dg+2MTgwkQYBUggdU +cylindrical_tiff_mask_ rXFE7wP9+I6iF54+h7p7z6xgBNs +cylindrical_jpeg_ bah+MfGVfpV90KzommgBpdfLoZM +cylindrical_tiff_m_cropped_ NQ/5MKH9mzv8OW4zWBh4FGSeYqY +equirectangular_tiff_lzw_ 4RA+UNwV1/Sh/iyDcqsw910oC5k +equirectangular_tiff_deflate_ 44cURQmay/xvYBK42CvSKZpO1HE +equirectangular_psd_mask_ 8+Mbi9L8SFFqHD9reoSZQGZeWgY +equirectangular_psd_nomask_ 07yBuTYz2+CvmzJ25hB/bExmIH8 +equirectangular_tiff_m_uncropped_ GOpwVNvXRvYPF43ftwQt8H1X72U +equirectangular_tiff_m_ IzGSS3ISKPeLlzW02CshIlg9Yk8 +equirectangular_psd_ 8ApcFVtv6+KjN1409M+Qj5kybFE +equirectangular_tiff_none_ rDL+P8lIeWrmZGvQf5rkbaQYHs4 +equirectangular_tiff_mask_ naWepxIuDbCPE9qzNy+LK1MGFgE +equirectangular_jpeg_ Ka5QDZC7c105SfM4jnav/0Cvp6o +equirectangular_tiff_m_cropped_ sYNlbIsH1jOKdw8tWRhjWzdy9ak +fisheye_tiff_lzw_ yIeSNrSiySal+kHf0Ms7GpwbHq0 +fisheye_tiff_deflate_ PBaPxP8QbeXg1DkClXGJdEmT3vA +fisheye_psd_mask_ /SUE9Vq0DYMnPAribs0cofKZ3QA +fisheye_psd_nomask_ fEDsWitN8KU28cy9B9hQVSZQyxI +fisheye_tiff_m_uncropped_ Ny7C1MIR0aBKN1nozqcHXQUDc/s +fisheye_tiff_m_ 38PCxwReIV3K5ztNBc0nEzSSqYc +fisheye_psd_ QMJ0Z4IXaRIrxpjw7LOV9yd0s+s +fisheye_tiff_none_ nDUX49XFWLbJUk29ecTVZpvDZXM +fisheye_tiff_mask_ SXYrCm/WiCS6g30HnvKwVLuOry4 +fisheye_jpeg_ 4fK0oFJNuFNPqP0k1Uk67YrTqBY +fisheye_tiff_m_cropped_ WzGuVX8uZOIu19XXD55AJD8p2UQ +stereographic_tiff_lzw_ OzhJBuYGrRNe32l7/CawxCuE4bI +stereographic_tiff_deflate_ mDJp6Y7ZISAAUhCzgL1bn0ydyLg +stereographic_psd_mask_ CVCxUhosQ9jnwyWTpAXsN7Xe+Ww +stereographic_psd_nomask_ We6zMTfXdQr8Y/UKFLnqkpuPooM +stereographic_tiff_m_uncropped_ oxs+HpxPQZ0q994hzhQLVJCp2mw +stereographic_tiff_m_ CJAKeGp2cx8LxWK+OAyISIsXxlk +stereographic_psd_ zLYW3PBRomUxzi5KfPumQBtobro +stereographic_tiff_none_ vxciPCtZdQ+F+HuzJAdgqu5+NYw +stereographic_tiff_mask_ Vu8+rVa4ycsCLR1OgoLh1wWD0YE +stereographic_jpeg_ xbKeFB8YgOuuUf8xuKJZIXCgC78 +stereographic_tiff_m_cropped_ kJIW2NUdwSnV6MVWOn2I9Dbs6rs +mercator_tiff_lzw_ Mx2xazaJmFjdfIxBqyeK2D1Tqk8 +mercator_tiff_deflate_ oiRDTslklO7kpSxwA9xXO1dtHic +mercator_psd_mask_ 2r8DvIt7WMUXdX9ttgRsdhnYY44 +mercator_psd_nomask_ SkEagkLAwgcv7mQUi01r7hHGgPM +mercator_tiff_m_uncropped_ dtvPCQBTq6XWrnzmsjnGlqFtZdg +mercator_tiff_m_ K3aTYlsaenoECRgfwZm6QT16nmQ +mercator_psd_ juQt8+EaY+IGhTB5uNX0Q2T0QGU +mercator_tiff_none_ FZvgKNU8NcRqhTcIvs3xDJUYPT8 +mercator_tiff_mask_ iysTBgK17GAF3BY+pYO8lgeYIgw +mercator_jpeg_ D9HPfCEWxC2OwA1k0WQERBVzkuY +mercator_tiff_m_cropped_ 2y4HTC55SffiQYvornd1T5QuxOw +transverseMercator_tiff_lzw_ zaiuK3E2c1fUSJ7cq7GjluiybGc +transverseMercator_tiff_deflate_ h7Cv3/QnJyn3w79ProEsngDJWhc +transverseMercator_psd_mask_ ve3UoFi/kzgU6s6JLdMyeC+j/dc +transverseMercator_psd_nomask_ Xo5sipJ2WU9xWDIaSLBes0DQo4Y +transverseMercator_tiff_m_uncropped_ C7C4fdRhQrbed4DD+ksQEzk8HOY +transverseMercator_tiff_m_ N79mR8wbugF3Prrg+17I8dYunMM +transverseMercator_psd_ SZQAkcuoNJv+q8tYM0ee2/OojkE +transverseMercator_tiff_none_ yaN519z0DKpxkLsFHlu1G6K1j30 +transverseMercator_tiff_mask_ 7SsHDtxFZ2nLsUQmZMWkN5F+DOs +transverseMercator_jpeg_ 3vZLbwTeHhw1z72XCUvH0AaVALQ +transverseMercator_tiff_m_cropped_ /0Bne7nvz2ZQCUBCCdZ6vw7t5Wk +sinusoidal_tiff_lzw_ 0MKrik4a0k0GXL4DNMaQskCkhlc +sinusoidal_tiff_deflate_ NzKwhUyQnw1Kp/l6eYS/VC1r024 +sinusoidal_psd_mask_ fsudD2ku1PYGPSlOip2PEmx3N3M +sinusoidal_psd_nomask_ EkXPMM1r0UNEkLaGEhfwx32LPgs +sinusoidal_tiff_m_uncropped_ xFJ8e5BEdmMcievJnST4YprllwA +sinusoidal_tiff_m_ nC7nRsOvPunyse3Y+ZZ/J4O3qNY +sinusoidal_psd_ GOSoSlOZ2iqbLGct7l4XQ47TysY +sinusoidal_tiff_none_ kZdTMuHseUbPA3wy+GWfbwQi3hs +sinusoidal_tiff_mask_ c4UR3zRz4S7gIMLpGEDzu3Mzt4E +sinusoidal_jpeg_ T4bBC44LTEizfXkaGiyCYzqhN2U +sinusoidal_tiff_m_cropped_ QHysGxrCKqkt4HflJS6XUje5J1c +albersEqualAreaConic_tiff_lzw_ N76Av3CZTlKB2j8e44AiQOfr4EM +albersEqualAreaConic_tiff_deflate_ 4UAX6sFmj4Ez5ms7fYzHaaOlOQo +albersEqualAreaConic_psd_mask_ 7KmgdsvqP/j25mBywIjHX16Daw4 +albersEqualAreaConic_psd_nomask_ KQzT8gETZ7FnDyuVCjzvmGTdNqs +albersEqualAreaConic_tiff_m_uncropped_ PGxRmK2yvWR+Uz3lAxX5Zgrl+nY +albersEqualAreaConic_tiff_m_ tHZCy93cW4gYTJnjFUwSX/83Yzc +albersEqualAreaConic_psd_ ND+WOo3pmxdOOcSIopZ9NBAfxf8 +albersEqualAreaConic_tiff_none_ J6465qgYcLFYbNpjI//4C4+GreM +albersEqualAreaConic_tiff_mask_ B12deGgAIXPUJ9ulAVO4XjD9aCQ +albersEqualAreaConic_jpeg_ 07197wC6uzQN+xqsg2NOvUd4gq4 +albersEqualAreaConic_tiff_m_cropped_ wW9RaAYUXO9JDBjutON72U/eZoQ +miller_tiff_lzw_ yUHt9sfD68jye2FjKHRlBMUXyuk +miller_tiff_deflate_ zg3elvQkWhxSCsfHzKVZWtZ7gKc +miller_psd_mask_ 9OdmVuhedXtmYAZRht0JYJSjYJ8 +miller_psd_nomask_ 3pgmrslRJNXX3LNttqRir35d7M4 +miller_tiff_m_uncropped_ pKrPyZMeo7tiOsTCej79X/K8Jp8 +miller_tiff_m_ FmEEK7STFj1YjYzlxerWnEED1t0 +miller_psd_ 1jRAMbmGSuKebNja2w6aU5YJ3yQ +miller_tiff_none_ y1zRJKGW+bYQ2jUZp4bTc8FEmDM +miller_tiff_mask_ HeEtkSnkpWNfgDgTN/qFvuWskFc +miller_jpeg_ tPLSBMw3pyddOhFginOv16iO6Gs +miller_tiff_m_cropped_ b4+/FW4QwlYLvf0pBQQPR3Kkm8I +pannini_tiff_lzw_ vntN8z8ax9WBViuwA4pnrq8tpkw +pannini_tiff_deflate_ DEVtUst+SraY92JAr9BM2hBGP7c +pannini_psd_mask_ YSzo/CTCtRIqmKwTmvamU0CY1y0 +pannini_psd_nomask_ vbr7D8/2ARk1YqhPY/+3IRhJ1AM +pannini_tiff_m_uncropped_ CegDSQshFp2Oa64cv8bJ4bKptqc +pannini_tiff_m_ v4Kz/iQOaHpGkKSpcA9ZAw41c2Q +pannini_psd_ gRUB0ZjxBEKin8GrnP9H/9nm5is +pannini_tiff_none_ AioSHuP2nSBuxPQ+FIDOFC9J04k +pannini_tiff_mask_ r2mNSqOOhj4xWIpTXcTx6Rvq9fk +pannini_jpeg_ zCpPZ6tV5WoDbCVBswbR8CVABzY +pannini_tiff_m_cropped_ U9Hw/s4TiQv7d2SRK3olHlwEGJg +architectural_tiff_lzw_ i3HUl2UE5zL6Lxi34WWHa0BMMGM +architectural_tiff_deflate_ M7cz5HEmM7PUS38uSHHEsuNnQqE +architectural_psd_mask_ gn6yhAm05KPM0vO6dlhkqICOR+c +architectural_psd_nomask_ hDSesA17JK050uU0lh81ovpbqGI +architectural_tiff_m_uncropped_ zohqcATi9Zr5TKABN/+htaRZYnY +architectural_tiff_m_ F0dVhk+UsAtBSvmZhic8uU/RuGw +architectural_psd_ oJtwCun0h6UykFAfCQTmiZQDBx4 +architectural_tiff_none_ yLCb618fc/y+hORC6oZrD2bWbx0 +architectural_tiff_mask_ J+T53BSdihZT6AqezEietUFEdbg +architectural_jpeg_ vaHHq+B5wbk3mW5cqi+GKltdEqc +architectural_tiff_m_cropped_ IirhsM2P3dJG9mzikcVBl1IQcdY +orthographic_tiff_lzw_ sJNLiMKnv/YoQwKEcakkwao/cYg +orthographic_tiff_deflate_ 2267i1TV/Zqm4Dd8kmJKfJNZkQU +orthographic_psd_mask_ u+S7i+N0nsjRrgRvYetlam+K+5A +orthographic_psd_nomask_ a0BjnR/eli5MLKDHeaiDPQY0wZw +orthographic_tiff_m_uncropped_ HuMyEcFI6EnpC1icOZUhMJz6ErY +orthographic_tiff_m_ pbquFIPP4RQhaAP3BfD04VkDMFw +orthographic_psd_ eKBDM0ffwlE3RsQ8GwMHn+Dbu5Q +orthographic_tiff_none_ VHp/J3KmMKOo0Ln3DYNAYLcqbEk +orthographic_tiff_mask_ C5Voge2xK0U3f4e9oIHwedccAxk +orthographic_jpeg_ EASmeB5Oi2v3ZpYW2107yZjB96U +orthographic_tiff_m_cropped_ YSv0euh2E5J7PjFJedmh3q73TDQ +equirectangularPanini_tiff_lzw_ jNjyVit/CfQaj+WIB1hcsnAx/Tw +equirectangularPanini_tiff_deflate_ kaDNuLApqnZd71pVjBZEP0NEPn0 +equirectangularPanini_psd_mask_ t5gb4O0SaX12izti3rAUSy4EVIU +equirectangularPanini_psd_nomask_ lVQvC7iSyb2IULIHU+fEG0PJ++A +equirectangularPanini_tiff_m_uncropped_ BHXWBsh6L27WcDDqvDzMOhEkl5s +equirectangularPanini_tiff_m_ VjpuL8MnjhiJ65EMkVuSYIE1S4g +equirectangularPanini_psd_ aeAwMnePI1LAjCiIJ/3Z2YU0Oek +equirectangularPanini_tiff_none_ RRHirCp/h4lRdxcoriwPxz/qWX8 +equirectangularPanini_tiff_mask_ kIgiXNWgT0xAbkYURLLq6jUbIKU +equirectangularPanini_jpeg_ RZBz8TphgGjQukhAisEmgibULFI +equirectangularPanini_tiff_m_cropped_ fCQwWB1ibZlgUPzlWkezjCLoTk0 +biplane_tiff_lzw_ 7XERu8+ZMRk6CwJ2/Tklj/sep88 +biplane_tiff_deflate_ Yo6/aRYSzEG4kUWAQe5+SyEOIF8 +biplane_psd_mask_ kpML82awMEoOMEWmt83jMO21Yh8 +biplane_psd_nomask_ PSzK/kTAmOtYClB2uOtKA58YDf0 +biplane_tiff_m_uncropped_ S7kpaoTcPUsyUFutBKHpG41C7x8 +biplane_tiff_m_ v1hPjuY4pgXVyEMp9nQTu3d/JAM +biplane_psd_ NtaZXkyOZKmoR5oMlkPvAK6yIrA +biplane_tiff_none_ Xo3Y4f4X7pEQ5aMjH7+LjzkU/d8 +biplane_tiff_mask_ fGK8k3CwZgvSHpxQ/795bd65fBA +biplane_jpeg_ egd94JQnccAti3ODYgeD6SwZ+kU +biplane_tiff_m_cropped_ mJgY/E5G4uAdaA5YT+f2vHfSzXI +a-1_ xd7ykKA3g+ID4tLY1g4oH4l77PU +a-0.3_ fXIR6b/xfHF9fnJy9c2jGwZiFIY +a0.4_ aFi7tbAndewIoMLixR9gvr+84Q4 +a1.1_ mNydugZi5LGxL1VT62vuJRbY4Gw +b-1_ tg/L1twtFA9Is5AlRNngEOmQ0M4 +b-0.3_ AG7F7U8aIL3rGILK8d9Ft6JE+O4 +b0.4_ QYILf/4tQFKKvLDU3zTzJuXnPMU +b1.1_ MUdYzZfOURY8gqktvxKm8kvOLmU +c-1_ VuDqDmeWqqYkDFH7GRA11QNv7Ng +c-0.3_ QvrwasJJyGgKxOynbLDxk8V//4Y +c0.4_ KcihDJ75lZ2qesZ10RkyBbqWXAw +c1.1_ Ol6CKGaAyjT0sgy97w/SZVWI85w +d-1_ 5n57JZs7HFWLPEZJqxSyPttmLZA +d-0.3_ /SqWEiUsjpSa5ifKjZQEw+3xh/Q +d0.4_ YCKVVDr1ZqmjWawujri+peaK48A +d1.1_ CnsO9UxPrBBNazgGAT4mqBbkvY4 +e-1_ w0rDn8xLB/Rxc7zstkZJDaSpCdE +e-0.3_ KIDgLNLQY1V5w3VXNiAVGEfbDJg +e0.4_ yT6zabjeZ51Bds0BTAjI/zIJ/6k +e1.1_ P6XEE0FTgk49Xr4lNOFOmHbX3lk +g-1_ PkdVOFae2+6xR0CLiN1heo28vwc +g-0.3_ gOYowXXkKxHJeyB7GeAAw12NOww +g0.4_ sukCE3PYEnZglXU2I0i5ewmzXeY +g1.1_ K7hoK4aqRtInNKULXEinakh5CWU +t-1_ DthnTSLrloLCmgpYUpIDub5M4jU +t-0.3_ yYCN0l/10aAMvwhsS4A9vHY7q3k +t0.4_ UuswoDF7s/Z2fTP/jZqWJuj3qNI +t1.1_ RD43l+M+kEO6Xmh5NQOzFp1Sw8g Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/f1/CMakeLists.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f1/CMakeLists.txt 2010-06-23 23:30:42 UTC (rev 1280) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f1/CMakeLists.txt 2010-06-27 23:09:54 UTC (rev 1281) @@ -8,3 +8,20 @@ #add_test(intanti ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-i -s" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") add_test(projections ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-p -s" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#parser tests +add_test(parser_f1_formats ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "f" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f1_projections ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "p" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(parser_f1_interpolators ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "i" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f1_a ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "A" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f1_b ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "B" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f1_c ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "C" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f1_d ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "D" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f1_e ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "E" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f1_g ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "G" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f1_t ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "T" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") + +#additional parser tests (takes much more time) +#add_test(parser_f1_projections_and_formats ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "pf" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(parser_f1_a_b_c ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "ABC" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(parser_f1_d_e ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "DE" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(parser_f1_g_t ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "GT" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f1/parser_reference.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f1/parser_reference.txt (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f1/parser_reference.txt 2010-06-27 23:09:54 UTC (rev 1281) @@ -0,0 +1,119 @@ +a-1_b-1_c-1_ EY78hhbqRDYfKD0RqHnpWKMjccc +a-1_b-1_c-0.3_ aZeedp2e/pEOF8E0raNr3C59d5M +a-1_b-1_c0.4_ 1zQ6p3si4FezV9AoosVa+Uz22uo +a-1_b-1_c1.1_ onCnVzARE2HVh3HNqK6lHm1XFos +a-1_b-0.3_c-1_ KvSZNnkbyNYdju9llz+wZ4jBTdI +a-1_b-0.3_c-0.3_ pr9+qqSdYWqJd6jqQ78WkTRV0cA +a-1_b-0.3_c0.4_ 306xo2hdj1lBDtKhzzNMsTIIa1s +a-1_b-0.3_c1.1_ LaKRr4E0HonGUwcOJgsRbwITpyY +a-1_b0.4_c-1_ MrdKH0SeVCu6CV1aJU/hofIeIxE +a-1_b0.4_c-0.3_ 24NlUozpD+bkmgO1k8Ytq+Js9Ok +a-1_b0.4_c0.4_ vuAc0umg6+mvCXW8NgkuoF2n6+8 +a-1_b0.4_c1.1_ P+eUYdyS1PgQ9++akCbYWgedWy8 +a-1_b1.1_c-1_ +SzXhe/M1b5aJM2Z6MLPxcTp9+8 +a-1_b1.1_c-0.3_ inuWE/Q9jsskFMHpVskNcXqm3zg +a-1_b1.1_c0.4_ kSOQ6o9oxOX630M9/3Zck5n9quc +a-1_b1.1_c1.1_ 1LOCyaNh02wTplb6NQqv+j03FZA +a-0.3_b-1_c-1_ Wons3Eq+05HHOaz2oRT80HKwypQ +a-0.3_b-1_c-0.3_ vKqnXh2vvVzG1Ofjraj50/MgriE +a-0.3_b-1_c0.4_ UGzre5LgKulQjJa4ame9CHb0zY8 +a-0.3_b-1_c1.1_ OHgm9fqEggkZhn42rdYlzPjRifc +a-0.3_b-0.3_c-1_ JgK/sVqDK+90EAkjVv6hHQBssPs +a-0.3_b-0.3_c-0.3_ GusgZKniN7pdyGQzt6e07Ssw0Jc +a-0.3_b-0.3_c0.4_ 7DhlXHdidQ2a06hGh4flsAf0eoA +a-0.3_b-0.3_c1.1_ II5u1X0zKGv3sASOlfKFFZzo024 +a-0.3_b0.4_c-1_ 5Ui/c5yoGV6CIITkqC5WujcgNb0 +a-0.3_b0.4_c-0.3_ 3/nJNpzncTq7pZ45ZdtWjXSGRUA +a-0.3_b0.4_c0.4_ kYpHZq3FNUZXAziNdrRLWccEllo +a-0.3_b0.4_c1.1_ +EUOhrbndVl5cMbMNdEQaSfKH3A +a-0.3_b1.1_c-1_ RcbWjarNYuQo7YGLyvXC3OfcAKU +a-0.3_b1.1_c-0.3_ PfbP4yEj7hsizSj8MQzqiLNzCxc +a-0.3_b1.1_c0.4_ tYhMEvAPNuP+UQ1e7Jmyf6VgbDw +a-0.3_b1.1_c1.1_ arSSxsoOXy9IMwudyzpeZ0sNfrc +a0.4_b-1_c-1_ Ot2C5p1un5Xv98QhlBbiH4V2Nsg +a0.4_b-1_c-0.3_ lRX+Q9Z6Qq/DxmUke2F5j4hVV+g +a0.4_b-1_c0.4_ 0G+PBmEw7xNVxAMu5aov+tn+2k8 +a0.4_b-1_c1.1_ JN3pSTGDLe2EG+3w+MSZEIY2xJQ +a0.4_b-0.3_c-1_ 12O9vFB6kz+RL2GF+8d5MIIlCVA +a0.4_b-0.3_c-0.3_ 0LERoFqlxUNJQ2G6KsogM4PZcfM +a0.4_b-0.3_c0.4_ vgytCUFM4xMbfEJJHee1Y51Z32Y +a0.4_b-0.3_c1.1_ 5mtDYCxFMdvsNnGPoGv5yMgYpD0 +a0.4_b0.4_c-1_ WnluQ5KtgXsfRxPG+7SjXULMas8 +a0.4_b0.4_c-0.3_ hUOQ4yGRGDE8tBn1/YZug458pqk +a0.4_b0.4_c0.4_ xER6db2/ma6sFoeBgWQxYUdBg7M +a0.4_b0.4_c1.1_ 9HD+gcBHtBPhxFDGJqnHXfdky+I +tiff_lzw_ 0Nj/UENZ8odlmQuUneBt0UyY6b4 +tiff_deflate_ hK2LJijaWdHKlzkde8I0kf8pEtM +psd_mask_ EmigfCdG+dLXdEGEOL95KLu6GKo +psd_nomask_ jWJ+XBLYTRlnBOUh2VzY5AERKxM +tiff_m_uncropped_ t1zY6REztLFspv8sCwuChQuEofc +tiff_m_ HknBkfdZugqSve7AiqHn7pYjU3o +psd_ 0MzpPafBGoLiXe5W95kIvgEmqXI +tiff_none_ qRkOoP95lw0pHSFw1m9mGcJBBK8 +tiff_mask_ h+oAUHMaw/sn/q4BTqqhOHWKHJ0 +jpeg_ +hj1ZNuTLdWkzKqw+Bhoz1zKA/U +tiff_m_cropped_ H66w9seo7uKYQZte4DxqIGKakKI +rectilinear_ TWqqwzZqrWEgj6tLrEscSmJpui8 +cylindrical_ gNKCr3NZPAjddsYx6qgeQ1QaCDk +equirectangular_ L5zYPe+qQh3xRibG3jEQwUt2fzs +fisheye_ u68GmUX1Nh4bfLR+ocYFjksJWUE +stereographic_ q3uGjAPURCK96uqsWxkjpo7UqBc +mercator_ FtZcp9G8uVVBBx9EOtUSbxrt/34 +transverseMercator_ Mcm5Wub24LXdeg7sUgAomDM0bSw +sinusoidal_ PmTjti8jBfi7V3niaVEyBq5B42U +albersEqualAreaConic_ 64+2GsPDa0FJiDnKEg4uc2ovTYc +miller_ 3W9iGCHhGvXu+k/rhCj9TwzL2jU +pannini_ Kqj5Z/a+LI9Y5/r1WYt7rYPE/YE +architectural_ 63zukb9Mqv0RCK6ILOChdBP/o5A +orthographic_ Nw6FW41QwLF+QwDIuhoU+9/S7YY +equirectangularPanini_ JWhUMydytgBa5V3jskU0+Gaourw +biplane_ Sn0Kxwt0M0l8dLpzgyVKQpD2CbM +i0_ L5zYPe+qQh3xRibG3jEQwUt2fzs +i1_ /AvcEWF6pqBNjluuosaRIS65mh4 +i2_ eYZ+Uz2Ce+LW9qOQm3sFEA2tLps +i3_ gi/3+dm2enfolnHhZS/pexgLsrM +i4_ 2e2Si/v7WlFXy/wXC/ZHwaKAm+Y +i5_ uRDoVaFjUNNYfXtJCdhAatiBfB8 +i6_ WfjILRKi3AjwmG1IG9icXW6qzxE +i7_ aByQLPqiApHBIiNbojvtRa/ojdI +i8_ moBxLCO6g+j1EVSC6KnPljpIX24 +i9_ ffwr6NQw+lX2z198ZmBazfvdyzU +i10_ IpH73jABQgpXXI4gY7tkjGp/XjU +i11_ DWxpgfTpghy5lxV4JE2AO15SR10 +i12_ w3k+cV9XNHewp7qhRHYk6CydMtw +i13_ bYHajl8vTd3fjFVQnBvncXSekp0 +i14_ 7wqn8+C0gvl+ABlgheX1dH0+Aug +i15_ 8J5OJuPuVJSjtiqy34cC+56AKsQ +i16_ zcPjAkE4zWAOq/V9kI6IHO66HnE +i17_ ylli7Jy7w6cs6TMoWoX7qzHA+PM +i18_ Tso29r4ag0t8A85FNxrDRyVq6M0 +i19_ 7Sr5PPqn79Nyfp2ajc2oRLk21i0 +i20_ swTONS1SRsGVOaNtuPd99DXjQc8 +a-1_ YxhDeMESdx/BrrgTfsBEGEATqeo +a-0.3_ DzvXWOtYOXQu9j9i0HhX9iVNnHo +a0.4_ sclGdkwsCng/AEp5JvBGLgn1ynw +a1.1_ YAzpP/32friyLO0QzENtSOXLKLI +b-1_ Rhr933II0XEtyusBZE452S8AFoE +b-0.3_ 9XPjnBgtKfw66JEkT9A3lYjO75k +b0.4_ 5nrr5ZP5aC2v5juW/Ztqp5wLJO0 +b1.1_ u6LDiEyWptVOKf7LhDS2d2az3gc +c-1_ kRFFaOu4gW1E6Mhck4ApXNInWek +c-0.3_ RTyeFKAweSGjrRB6zeZQ6Za1Iso +c0.4_ aiTDVUnDn4w4NBemJiYxMTGLb9g +c1.1_ RWMFehgMuuVtLvt3t2znwb6JeiM +d-1_ kWRUnIDbbnMzDDgS2vvy3cHHDWo +d-0.3_ e9ZkgYa5FwVZwlE+ixWOYN9dL8E +d0.4_ 74lTQsEHdkqYFsYdwgr+Q2uVjSA +d1.1_ aie5D7IeVYAMWfv9vFHwA/zwBRM +e-1_ 8sQ01eYiD68a2SxqwE4uACNKj6Q +e-0.3_ vyG1pQxmQemeFkT1sEsK2p5omaU +e0.4_ J+KxnSEeYQaXdNXQHIAI2KayOBI +e1.1_ jKgGLRiZP5HZ51BwZqCcEq0wVa4 +g-1_ xtvycQUJqZV9ipNQy7K7a9yaGwI +g-0.3_ 8ihEXDcppzj96uwdlgoyJf3i5gg +g0.4_ mixIj693vROJOaSarNozeiBBBBM +g1.1_ cYgV1MfPmyL+Qz+ckWjPiRk0Eus +t-1_ c7MpQbyJ7mwFPmvY/5qR/ioKMHM +t-0.3_ bvjpD7WoawRsNtpf0HoObKIQqHo +t0.4_ 9JmPKT7fkrHGLUv6N9PLqsJctJQ +t1.1_ xMex0Ae1pB+wFyzLPiYii4jlsPw Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/CMakeLists.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f2/CMakeLists.txt 2010-06-23 23:30:42 UTC (rev 1280) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f2/CMakeLists.txt 2010-06-27 23:09:54 UTC (rev 1281) @@ -6,3 +6,20 @@ add_test(parameter_f2 ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-a -s" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") #add_test(projections ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-p -s" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#parser tests +add_test(parser_f2_formats ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "f" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f2_projections ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "p" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(parser_f2_interpolators ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "i" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f2_a ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "A" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f2_b ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "B" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f2_c ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "C" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f2_d ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "D" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f2_e ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "E" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f2_g ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "G" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f2_t ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "T" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") + +#additional parser tests (takes much more time) +#add_test(parser_f2_projections_and_formats ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "pf" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(parser_f2_a_b_c ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "ABC" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(parser_f2_d_e ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "DE" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(parser_f2_g_t ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "GT" Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/parser_reference.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f2/parser_reference.txt (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f2/parser_reference.txt 2010-06-27 23:09:54 UTC (rev 1281) @@ -0,0 +1,54 @@ +tiff_lzw_ 3wQqdmj0mOKMSKb/uf9y9Xvkn4Q +tiff_deflate_ SVFCke1FQlKWWfOnF7cfdd53EtY +psd_mask_ /bxDFRsQLE2adJ/SJ9fJYLcY+UM +psd_nomask_ 41AkRqIoJOfs5zYkbjL5f4HI+/k +tiff_m_uncropped_ XqxHy74MWaplxODwUBImQAGbdu8 +tiff_m_ ddwqHjDWNpfx4M06OWOnbIIxazk +psd_ xSgjh2lCg8GgISuSe4LBU1pYR5Q +tiff_none_ VwAOYw0eFK1POn1W1+Z4e1dGPbY +tiff_mask_ JjLIelCmoosB0ij1E4gQsUhZXAk +jpeg_ k228mUdDQ8SMriZt3uQ0Po8OxRw +tiff_m_cropped_ 8gzyMGbKPDsHjLwdIVCk3fRmsMY +rectilinear_ kHBkr7+baBSz+Cbs+7cs0bYpu9o +cylindrical_ /hbzDEmPnvVgYS9GwXJwaHG62Dw +equirectangular_ 3XWWhIuJ5TYp6ljGJ0Ac7bPtxC0 +fisheye_ VY1XffGsOT2xeBzYsBiwQjesjPQ +stereographic_ ASVA72cl/D5PMgt26+DaiZ7j694 +mercator_ OOyiahewQGrOhDE0dG/v7CZUCJI +transverseMercator_ Q2ayOyQ6ptGgHQm7zRUP45YaR6k +sinusoidal_ axoPQ3KSmUe75KvjRnvALtdmXKI +albersEqualAreaConic_ 78+QcTj+U95zNhbnezVhFKxFbu8 +miller_ j4S6gQ0DhdLm/PjNqOZpIjmaohw +pannini_ qkmEDhpcAO95oWxDc/EfT3pNAbA +architectural_ uNhDcJg5bYMqbLoP428lcbuOF7w +orthographic_ 2k/fimjSB8WXJfvr19K7j+K2a/I +equirectangularPanini_ I62sqEtPLwT8q+p6fk+Af2Joi44 +biplane_ RlTG+ogvaNRfMQEuFB4vP1X1X5g +a-1_ erNyKo0rhSFQCeilrExfxase2Uc +a-0.3_ +xcoJPOhOoR7xkBQlkIr3eivlHw +a0.4_ llOyzYrZKhzR7i6VQHF8zc4co/8 +a1.1_ EDbkddh3tL9usz8XRj1RHzWyfK4 +b-1_ 0GCLOkB2qtZ+QNBp516mzckfXy8 +b-0.3_ VUWR76QadterHMfXDj9OWIcnZQU +b0.4_ grieHuk3tuOq5kZ0YCJkTyWs3Jg +b1.1_ TJD/Fltju9Fc1r/f75SEx2lTKNk +c-1_ MrbbDrVf1dmVCPBX9GvwfwN9L1w +c-0.3_ JKMlg0lAfJczdzC67de9n90wfbE +c0.4_ yx0qUk2ZO9ck/vDq5hkzE2v7WQE +c1.1_ shfBulFAs9bb7MM9csUud33Epj0 +d-1_ C3Y+q8XVhGd2s6anUAFhvePRU9Q +d-0.3_ GoGBAn3zkh8aWA79kLseTC890g8 +d0.4_ LK3aghjWThQxalOneBmGwtq9QOE +d1.1_ 6K3hYQ3BmWuA685TIZfMK9sLXpE +e-1_ lmXIneoyoeMGMp0V8irj6nagrQQ +e-0.3_ 5IG3yotcUg+ADGjyDNzCvvSJ2RA +e0.4_ O68JXh1xIAlSicjcpxeOojJY05k +e1.1_ Zj6XwFMpeYUBlKTmwozYHJyUS2M +g-1_ j6wyl1+jWw08SfDiUwESkxVuExA +g-0.3_ J6BEfo0WvWP4jRsEh5CYrhI/V1w +g0.4_ Vw8IgeCXi0ECh7bv51zrVGAuKCE +g1.1_ B7p028aYfmjRlhgxf1S5uHSI28Q +t-1_ 5mcx35C7yF5+oCemE/kyDGbKFsE +t-0.3_ wdEzHvl/K7LUNM+RjrCXX/OeSlY +t0.4_ /URqUf6w/fDHpmGtKABsVIdp9xw +t1.1_ PN/xWSnGLa5rBUfdhO8Qbe33jb4 Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/CMakeLists.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f3/CMakeLists.txt 2010-06-23 23:30:42 UTC (rev 1280) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f3/CMakeLists.txt 2010-06-27 23:09:54 UTC (rev 1281) @@ -6,3 +6,20 @@ #add_test(parameter_f3 ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-a -s" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") #add_test(projections ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-p -s" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#parser tests +add_test(parser_f3_formats ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "f" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f3_projections ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "p" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(parser_f3_interpolators ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "i" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f3_a ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "A" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f3_b ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "B" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f3_c ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "C" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f3_d ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "D" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f3_e ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "E" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f3_g ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "G" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +add_test(parser_f3_t ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "T" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") + +#additional parser tests (takes much more time) +#add_test(parser_f3_projections_and_formats ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "pf" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(parser_f3_a_b_c ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "ABC" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(parser_f3_d_e ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "DE" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +#add_test(parser_f3_g_t ${PERL_EXECUTABLE} "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "GT" Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/parser_reference.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f3/parser_reference.txt (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f3/parser_reference.txt 2010-06-27 23:09:54 UTC (rev 1281) @@ -0,0 +1,54 @@ +tiff_lzw_ BCTRc+ha767wS6D29aXy2c+5Xnw +tiff_deflate_ ToWlmSN67ekXAcYJ7hqHejN/CJ0 +psd_mask_ EdjiCtwIbhwSc+BPYAxiOJKYo5o +psd_nomask_ WRa/4p+KW9xV+bGAnRSZdPAybK0 +tiff_m_uncropped_ 2idJuPlnWMyIV5hD8EJ10kb6tmE +tiff_m_ jGM+AvN/oneocw1OTrlTtq8JhBw +psd_ 9RaHo8Nx4iSjA1QBuerM51RAMq8 +tiff_none_ fjgS9TwaqLThKDrB4frwa0JutfI +tiff_mask_ SGPAe6qU2a5t/unT0rleOgD42Kc +jpeg_ Z5gHcTZl00focbM1SHf3m47k4yY +tiff_m_cropped_ 3O/n8+9/QgcIni1eWXk2GOTaKpw +rectilinear_ 4H0nKwav1nZ+smAueHiky4qrzjo +cylindrical_ a3aFoykz2VeJLkux09ba5d2SHuw +equirectangular_ ej5weM+7jD8kthdz9C6bWlcLR2g +fisheye_ w4mT5fnTOYUU8uOyfByTqEfFTUo +stereographic_ gSp+BYXvks7MvOnTaNiZI+SZgX0 +mercator_ LcPoUpCCA+JlYZscJbQ8cWt/Sr0 +transverseMercator_ 9QoyD0xYIIA3M0njnT0MJL4dlHc +sinusoidal_ yB0nFBZzQQ3uFuUbMV/iMWpGloU +albersEqualAreaConic_ cXfaP3XVpjuPTVeIlyDwlMwM75c +miller_ w0pOZg6Oj4wxL9C3arBokyvI7h8 +pannini_ srDRlxvbqePW0homJxtt8JUmNtU +architectural_ PfVUubUasOeSit5afYzvfm4Hp1E +orthographic_ 9WoBpLBIDz/AWqnxzAGTAzPpqRQ +equirectangularPanini_ sl+lOsqRnMGNCCtJaBL+u9osfNg +biplane_ FAAnLMPIyT8RlHCZ4jbxTf9FEIs +a-1_ nMrGtDP1G6O9pMhExQuV6jNRYMQ +a-0.3_ OR0emMSebTXBdqexDzGd7dC6TFI +a0.4_ l4rt8wXrss6QUji2YQW6LWfhcJA +a1.1_ W88Rv8bdu69nXKYpUIt7pEKNtnw +b-1_ akDRzjsG1784TjdAbgnKHF0/urs +b-0.3_ zdkvvBoXwLX3zYFjf0/b7+tn7Dw +b0.4_ F1c6YvHA6YVM4BKFEsAb6DEF60s +b1.1_ DFBQGH6048oRe41DryrzT77T01g +c-1_ Wr2bY4FOggW8kPvnvKf7K0QLtNQ +c-0.3_ uJUAH/X+Zndje4IiYOW8loS5huI +c0.4_ TZJ0eX18s/LGcQnd0Oz+/bbv4zU +c1.1_ mnLCgZLKyzIYZOZ60YGvH3xE17E +d-1_ /CnSpa438pGdwvzsm8lP8T5aIIw +d-0.3_ 9ZlJMmByLqGS0U0yNFs/BABPm/0 +d0.4_ 4VXUuSe1i8/nnltAOtQoFj35eO4 +d1.1_ f/zSL1AHrpe/y7Ms+NavoQcJWTs +e-1_ N8xvOKuznt0t2y16JDp1H3Pnl48 +e-0.3_ T0xWCiDf4cdTK4TJLYqNiZhba9o +e0.4_ Ry6NgQ/JJJCzOezzWi7vY7RkLis +e1.1_ LSLc4HEPH0xP7m4z6DGDcCh5cIk +g-1_ Dra9EJn1N5VdJxgL0yZJbaYLLWg +g-0.3_ GrA/jTDESh47nEz55hW/DOt06ww +g0.4_ tImTklVBBUFSbXgEob9ix/SiGx8 +g1.1_ lN6jngXPZ1C7d+PHjkFFfCLMVWk +t-1_ N+k5txd0Pz8Sva8355kWVNm4uZs +t-0.3_ thT8GrOW4KN9qNVLee/720dleOI +t0.4_ rhHZ4Si5VALHF/pDIqRYIn8SBMI +t1.1_ 1QUzB+59Et8WwUFwazIIL3X2I1U Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/parser.pl =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/parser.pl 2010-06-23 23:30:42 UTC (rev 1280) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/parser.pl 2010-06-27 23:09:54 UTC (rev 1281) @@ -3,13 +3,22 @@ use warnings; use Panotools::Script; use Pod::Usage; +use Switch; use Time::HiRes qw[gettimeofday tv_interval]; -use Digest::SHA1 qw(sha1_base64); +use Digest::SHA1 qw(sha1_base64); -my $pto_in = "test.txt"; +my $newReference = 0; +my $addResults = 1; +my $failedTestsNo = 0; +my $paramStart = -1.0; +my $paramEnd = 1.1; +my $paramStep = 0.7; +my $testList = shift or pod2usage( -verbose => 2 ); +my $pto_in = shift or pod2usage( -verbose => 2 ); + #start of logging -open( LOG, "> tests.log" ) or die $!; +open( LOG, "> parserTests.log" ) or die $!; my @months = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); my @weekDays = qw(Sun Mon Tue Wed Thu Fri Sat Sun); my ( @@ -36,8 +45,8 @@ 'psd_mask' => "\"PSD_mask\"", ); - my $pto = new Panotools::Script; - $pto->Read($pto_in); +my $pto = new Panotools::Script; +$pto->Read($pto_in); my @projections = ( ['rectilinear', 0, 110, 110, $pto->Panorama->{w}, $pto->Panorama->{w}], @@ -48,17 +57,17 @@ ['mercator', 5, 360, 133, $pto->Panorama->{w}, $pto->Panorama->{h}], ['transverseMercator', 6, 133, -1, $pto->Panorama->{h}, $pto->Panorama->{w}], ['sinusoidal', 7, 360, 180, $pto->Panorama->{w}, $pto->Panorama->{h}], - ['lambertCylindrical', 8, 360, -1, $pto->Panorama->{w}, $pto->Panorama->{h}], - ['lambertAzimuthal', 9, 360, -1, $pto->Panorama->{w}, $pto->Panorama->{h}], + #['lambertCylindrical', 8, 360, -1, $pto->Panorama->{w}, $pto->Panorama->{h}], + #['lambertAzimuthal', 9, 360, -1, $pto->Panorama->{w}, $pto->Panorama->{h}], ['albersEqualAreaConic', 10, 360, -1, $pto->Panorama->{w}, $pto->Panorama->{h}], ['miller', 11, 360, 145.6, $pto->Panorama->{w}, $pto->Panorama->{h}], ['pannini', 12, 180, 76.3, $pto->Panorama->{w}, $pto->Panorama->{h}], ['architectural', 13, 360, 103.5, $pto->Panorama->{w}, $pto->Panorama->{h}*0.5], ['orthographic', 14, 180, -1, $pto->Panorama->{w}, $pto->Panorama->{w}], - ['equisolid', 15, 360, -1, $pto->Panorama->{w}, $pto->Panorama->{w}], + #['equisolid', 15, 360, -1, $pto->Panorama->{w}, $pto->Panorama->{w}], ['equirectangularPanini', 16, 300, 150, $pto->Panorama->{w}, $pto->Panorama->{h}], ['biplane', 17, 200, 132.5, $pto->Panorama->{w}, $pto->Panorama->{h}], - ['triplane', 18, 200, 90, $pto->Panorama->{w}, $pto->Panorama->{h}], + #['triplane', 18, 200, 90, $pto->Panorama->{w}, $pto->Panorama->{h}], ); unless ( -d "tests" ) { @@ -67,9 +76,13 @@ } start($pto); -compare("test_results.txt", "reference_results.txt"); +#if ( !$newReference ) { +# compare( "parser_test.txt", "parser_reference.txt" ); +#} + print "All selected tests are done\n"; +print "Number of tests that failed: " . $failedTestsNo . "\n"; close(LOG); #functions @@ -77,131 +90,250 @@ sub start { my ($pto) = @_; my $description = ""; - `rm -f test_results.txt`; - projections($pto, $description) + if ( !$newReference && -e "parser_test.txt" ) { + `rm -f parser_test.txt`; + } + elsif ( $newReference && -e "parser_reference.txt" ) { + `rm -f parser_reference.txt`; + } + control( $pto, $description ); } sub test { - my ($pto, $description) = @_; - $description = $description . "hash: "; - my $path = "tests/parser/tmp.txt"; - unless ( -d $path) { - mkdir("tests/parser/"); + my ( $pto, $description ) = @_; + $description = $description . " "; + my $path = "tests/tmp.txt"; + unless ( -d "tests" ) { + mkdir("tests"); } $pto->Write($path); PTmenderAdapt($path); - my $output = `../../../tools/PTmender -o tmp $path`; + my $output = `/home/tom/GSoC/build.my_branch3/tools/PTmender -o tmp $path`; + print $description; + + #my $output = `../../../tools/PTmender -o tmp $path`; $output = sha1_base64($output); + my $resultsPath = ""; `rm -f tmp*.*`; - my $resultsPath="test_results.txt"; - open(FILE,">>$resultsPath") || die("Cannot Open File $resultsPath"); - print FILE $description.$output."\n"; + if ($newReference) { + $resultsPath = "parser_reference.txt"; + } + else { + $resultsPath = "parser_test.txt"; + } + open( FILE, ">>$resultsPath" ) || die("Cannot Open File $resultsPath"); + print FILE $description . $output . "\n"; close FILE or die $!; + if ( compareOne( $description . $output . "\n", "parser_reference.txt" ) eq + "OK" ) + { + print "OK\n"; + } + else { + print "FAIL\n"; + + #save failed test + `cp $path tests/failed_test_$failedTestsNo.txt`; + $failedTestsNo++; + } $description = ""; } +#comparing 2 files - reference file with test results sub compare { - my ($path1, $path2) = @_; - open(FILE1,$path1) || die("Cannot Open File $path1"); - open(FILE2,$path2) || die("Cannot Open File $path2"); + my ( $path1, $path2 ) = @_; + open( FILE1, $path1 ) || die("Cannot Open File $path1"); + open( FILE2, $path2 ) || die("Cannot Open File $path2"); while (<FILE1>) { - my $out1 = $_; + my $out1 = $_; + my $found = 0; + my ( $out1_pre, $out1_post ) = split( / /, $out1 ); + seek( FILE2, 0, 0 ); while (<FILE2>) { my $out2 = $_; - my ($out1_pre,$out1_post) = split(/ /,$out1); - my ($out2_pre,$out2_post) = split(/ /,$out2); + my ( $out2_pre, $out2_post ) = split( / /, $out2 ); if ( $out1_pre eq $out2_pre ) { - #found test - print "Comparing $out1_pre: "; + + #found the same test + $found = 1; + print "Comparing $out1_pre ... "; if ( $out1_post eq $out2_post ) { print "OK\n"; } else { - print "NOT OK\n"; + print "FAIL\n"; } + last; } } + if ( !$found ) { + print "Error reference not found\n"; + } } + close FILE1 or die $!; + close FILE2 or die $!; } +#tries to find in reference file matching test +sub compareOne { + my ( $testResult, $path ) = @_; + open( FILE, $path ) || die("Cannot Open File $path"); + my $found = 0; + my $result = "FAIL"; + my ( $testResult_pre, $testResult_post ) = split( / /, $testResult ); + while (<FILE>) { + my $out = $_; + my ( $out_pre, $out_post ) = split( / /, $out ); + + if ( $out_pre eq $testResult_pre ) { + + #found the same test + $found = 1; + print "Comparing $testResult_pre ... "; + if ( $out_post eq $testResult_post ) { + $result = "OK"; + } + last; + } + } + close FILE or die $!; + if ( !$found ) { + if ($addResults) { + open( FILE, ">>$path" ) || die("Cannot Open File $path"); + print FILE $testResult; + print "Added to reference ... "; + $result = "OK"; + close FILE or die $!; + } + else { + print "Error reference not found ... "; + } + } + + return $result; +} + +sub control { + my ( $pto, $description ) = @_; + + switch ($testList) { + + case /p/ { + $testList =~ s/p//; + projections( $pto, $description ); + } + case /f/ { + $testList =~ s/f//; + formats( $pto, $description ); + } + case /i/ { + $testList =~ s/i//; + interpolator( $pto, $description ); + } + case /A/ { + $testList =~ s/A//; + params( $pto, $description, "a" ); + } + case /B/ { + $testList =~ s/B//; + params( $pto, $description, "b" ); + } + case /C/ { + $testList =~ s/C//; + params( $pto, $description, "c" ); + } + case /D/ { + $testList =~ s/D//; + params( $pto, $description, "d" ); + } + case /E/ { + $testList =~ s/E//; + params( $pto, $description, "e" ); + } + case /G/ { + $testList =~ s/G//; + params( $pto, $description, "g" ); + } + case /T/ { + $testList =~ s/T//; + params( $pto, $description, "t" ); + } + + else { } + } + return $testList; +} + sub projections { - my ($pto, $description) = @_; + my ( $pto, $description ) = @_; for ( my $i = 0 ; $i <= $#projections ; $i++ ) { - $description = $description . $projections[$i][0] ."_"; + my $description2 = $description . $projections[$i][0] . "_"; $pto->Panorama->{f} = $projections[$i][1]; $pto->Panorama->{v} = $projections[$i][2]; $pto->Panorama->{w} = $projections[$i][4]; $pto->Panorama->{h} = $projections[$i][5]; - formats($pto, $description); - } + + if ( $testList eq "" ) { + test( $pto, $description2 ); + } + else { + my $testListTmp = $testList; + control( $pto, $description2 ); + $testList = $testListTmp; + } + } } sub formats { - my ($pto, $description) = @_; + my ( $pto, $description ) = @_; my ( $key, $format ); while ( ( $key, $format ) = each(%formats) ) { - $description = $description . $key ."_"; + my $description2 = $description . $key . "_"; $pto->Panorama->{n} = $format; - test($pto, $description); - #interpolator($pto); + + if ( $testList eq "" ) { + test( $pto, $description2 ); + } + else { + my $testListTmp = $testList; + control( $pto, $description2 ); + $testList = $testListTmp; + } } - } sub interpolator { - my ($pto) = @_; - for ( my $i = 0; $i < 23; $i++ ) { + my ( $pto, $description ) = @_; + for ( my $i = 0 ; $i < 23 ; $i++ ) { + my $description2 = $description . "i$i\_"; $pto->Mode->{i} = $i; - paramA($pto); + + if ( $testList eq "" ) { + test( $pto, $description2 ); + } + else { + my $testListTmp = $testList; + control( $pto, $description2 ); + $testList = $testListTmp; + } } } -sub paramA { - my ($pto) = @_; - for ( my $i = 0.0; $i <= 2.0; $i += 0.1 ) { - $pto->Image->[0]->{a} = $i; - paramB($pto); - } -} -sub paramB { - my ($pto) = @_; - for ( my $i = 0.0; $i <= 2.0; $i += 0.1 ) { - $pto->Image->[0]->{b} = $i; - paramC($pto); - } -} -sub paramC { - my ($pto) = @_; - for ( my $i = 0.0; $i <= 2.0; $i += 0.1 ) { - $pto->Image->[0]->{c} = $i; - paramD($pto); - } -} -sub paramD { - my ($pto) = @_; - for ( my $i = 0.0; $i <= 2.0; $i += 0.1 ) { - $pto->Image->[0]->{d} = $i; - paramE($pto); - } -} -sub paramE { - my ($pto) = @_; - for ( my $i = 0.0; $i <= 2.0; $i += 0.1 ) { - $pto->Image->[0]->{e} = $i; - paramG($pto); - } -} -sub paramG { - my ($pto) = @_; - for ( my $i = 0.0; $i <= 2.0; $i += 0.1 ) { - $pto->Image->[0]->{g} = $i; - paramT($pto); - } -} -sub paramT { - my ($pto) = @_; - for ( my $i = 0.0; $i <= 2.0; $i += 0.1 ) { - $pto->Image->[0]->{t} = $i; +sub params { + my ( $pto, $description, $param ) = @_; + for ( my $i = $paramStart ; $i <= $paramEnd ; $i += $paramStep ) { + my $description2 = $description . "$param$i\_"; + for my $image ( @{ $pto->Image } ) { + $image->{$param} = $i; + } + if ( $testList eq "" ) { + test( $pto, $description2 ); + } + else { + my $testListTmp = $testList; + control( $pto, $description2 ); + $testList = $testListTmp; + } } } @@ -229,7 +361,6 @@ close FILE or die $!; } - #log sub logIt { my ($logText) = @_; @@ -237,8 +368,6 @@ print LOG $logText; } - - __END__ =head1 NAME @@ -247,10 +376,26 @@ =head1 SYNOPSIS - perl allGen.pl + perl allGen.pl <options> <template_path> =head1 DESCRIPTION +available <options> + - p for projection + - f for formats + - i for interpolators + - A for 'a' parameter + - B for 'b' parameter + - C for 'c' parameter + - D for 'd' parameter + - E for 'e' parameter + - G for 'g' parameter + - T for 't' parameter + + for example: + - perl allGen.pl pf test.txt will test all possible combinations projection + and formats test + - perl allGen.pl i test.txt will test onterpolators only etc. =head1 LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tom...@us...> - 2010-07-13 01:27:14
|
Revision: 1285 http://panotools.svn.sourceforge.net/panotools/?rev=1285&view=rev Author: tomaszmeger Date: 2010-07-13 01:27:06 +0000 (Tue, 13 Jul 2010) Log Message: ----------- Added reference for PToptimizer, fixed some other tests. Modified Paths: -------------- branches/libpano_gsoc2010_regtests/tests/gsoc/f0/CMakeLists.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/CMakeLists.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/simple/simple.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f3/CMakeLists.txt branches/libpano_gsoc2010_regtests/tests/gsoc/gen.pl branches/libpano_gsoc2010_regtests/tests/gsoc/optTests.pl branches/libpano_gsoc2010_regtests/tests/gsoc/parser.pl Added Paths: ----------- branches/libpano_gsoc2010_regtests/tests/gsoc/f0/optimizer.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/optimizer_everything.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/optimizer_everything_wo_trans.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/optimizer_pos.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/optimizer_pos_barrel.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/optimizer_pos_trans.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/optimizer_pos_trans_barrel.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/optimizer_pos_trans_view.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/optimizer_pos_trans_view_barrel.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/optimizer_pos_view.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/optimizer_pos_view_barrel.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/optimizer.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PToptimizer/ branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PToptimizer/reference/ branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PToptimizer/reference/optimizer_everything.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PToptimizer/reference/optimizer_everything_wo_trans.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PToptimizer/reference/optimizer_pos.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PToptimizer/reference/optimizer_pos_barrel.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PToptimizer/reference/optimizer_pos_trans.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PToptimizer/reference/optimizer_pos_trans_barrel.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PToptimizer/reference/optimizer_pos_trans_view.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PToptimizer/reference/optimizer_pos_trans_view_barrel.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PToptimizer/reference/optimizer_pos_view.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PToptimizer/reference/optimizer_pos_view_barrel.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f3/optimizer.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PToptimizer/ branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PToptimizer/reference/ branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PToptimizer/reference/optimizer_everything.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PToptimizer/reference/optimizer_everything_wo_trans.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PToptimizer/reference/optimizer_pos.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PToptimizer/reference/optimizer_pos_barrel.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PToptimizer/reference/optimizer_pos_trans.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PToptimizer/reference/optimizer_pos_trans_barrel.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PToptimizer/reference/optimizer_pos_trans_view.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PToptimizer/reference/optimizer_pos_trans_view_barrel.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PToptimizer/reference/optimizer_pos_view.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PToptimizer/reference/optimizer_pos_view_barrel.txt Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/CMakeLists.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f0/CMakeLists.txt 2010-07-11 02:03:52 UTC (rev 1284) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/CMakeLists.txt 2010-07-13 01:27:06 UTC (rev 1285) @@ -23,3 +23,5 @@ #set_test(parser_f0_d_e "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "DE ${CMAKE_CURRENT_SOURCE_DIR}/test.txt") #set_test(parser_f0_g_t "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "GT ${CMAKE_CURRENT_SOURCE_DIR}/test.txt") #set_test(parser_f0_projections_and_formats "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "pf ${CMAKE_CURRENT_SOURCE_DIR}/test.txt") + +set_test(PToptimizer_f0 "${TOP_SRC_DIR}/tests/gsoc/optTests.pl" "" "${CMAKE_CURRENT_SOURCE_DIR}/optimizer.txt") Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/optimizer.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f0/optimizer.txt (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/optimizer.txt 2010-07-13 01:27:06 UTC (rev 1285) @@ -0,0 +1,140 @@ +# PTStitcher script, written by hugin + +p f2 w11640 h5755 v360 n"TIFF_m c:NONE" +m g1 i0 f0 m2 p0.00784314 + +# output image lines +i w2336 h3504 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p29.5854653922993 r-1.25828188551223 t0 v72.2213 y0 u10 m0 n"./060720_6556.jpg" +i w2336 h3504 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p29.5913706578841 r-0.992326704086645 t0 v72.2213 y45.5072541329743 u10 m0 n"./060720_6557.jpg" +i w2336 h3504 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p29.4014565195123 r-0.774176840542781 t0 v72.2213 y90.3167925087562 u10 m0 n"./060720_6558.jpg" +i w2336 h3504 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p29.1367078566066 r-0.868013771261336 t0 v72.2213 y135.711689689941 u10 m0 n"./060720_6559.jpg" +i w2336 h3504 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p150.973039189246 r178.917940467963 t0 v72.2213 y0.918212020490364 u10 m0 n"./060720_6560.jpg" +i w2336 h3504 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p29.1481002984711 r-1.27292397946249 t0 v72.2213 y-134.183331339811 u10 m0 n"./060720_6561.jpg" +i w2336 h3504 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p29.3070389126475 r-1.34767158643817 t0 v72.2213 y-89.1548757295396 u10 m0 n"./060720_6562.jpg" +i w2336 h3504 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p29.4120521079244 r-1.3736909523997 t0 v72.2213 y-44.3327611689326 u10 m0 n"./060720_6563.jpg" +i w2336 h3504 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p-29.8288972815969 r0.333288092599086 t0 v72.2213 y0.781911240965593 u10 m0 n"./060720_6564.jpg" +i w2336 h3504 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p-29.8408853550192 r0.542509597785516 t0 v72.2213 y45.5793373867024 u10 m0 n"./060720_6565.jpg" +i w2336 h3504 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p-30.0136717198283 r0.723520003300046 t0 v72.2213 y90.4176380574451 u10 m0 n"./060720_6566.jpg" +i w2336 h3504 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p-30.2578224313702 r0.662053082191327 t0 v72.2213 y135.772969167834 u10 m0 n"./060720_6567.jpg" +i w2336 h3504 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p-30.3660104181049 r0.487774538257366 t0 v72.2213 y-178.713941888217 u10 m0 n"./060720_6568.jpg" +i w2336 h3504 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p-30.2774662253677 r0.231699460723244 t0 v72.2213 y-133.620194210743 u10 m0 n"./060720_6569.jpg" +i w2336 h3504 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p-30.0927436500294 r0.153595951940199 t0 v72.2213 y-87.4938004959903 u10 m0 n"./060720_6570.jpg" +i w2336 h3504 f0 TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 g0 p-29.9525123413865 r0.177318850587939 t0 v72.2213 y-43.5943548553294 u10 m0 n"./060720_6571.jpg" + +# control points +c n0 N1 x1850 y2093 X549.963 Y2078.63 t0 +c n0 N1 x1931 y3047 X256.685 Y3019.8 t0 +c n0 N1 x2190 y1344 X1066.32 Y1551.03 t0 +c n1 N2 x2256 y1639 X1034.5 Y1799.12 t0 +c n1 N2 x2156 y2461 X703.977 Y2460.36 t0 +c n1 N2 x1610 y2550 X131.398 Y2500.93 t0 +c n2 N3 x1632 y2601 X105.82 Y2555.27 t0 +c n2 N3 x1796.5 y2767.5 X223 Y2736.5 t0 +c n2 N3 x1674 y1452 X637.817 Y1423.97 t0 +c n3 N4 x1249 y1434 X191 Y1166.5 t0 +c n3 N4 x2067 y1613 X899.732 Y1721.38 t0 +c n3 N4 x2107 y3350 X322.196 Y3296.01 t0 +c n4 N5 x1909 y3005 X266.114 Y2980.97 t0 +c n4 N5 x1755 y1514 X695.377 Y1523.09 t0 +c n4 N5 x1771 y1591 X323 Y3429.96 t1 +c n5 N6 x2155 y1405 X1032.25 Y1587.2 t0 +c n5 N6 x1784 y2694 X253.763 Y2662.99 t0 +c n6 N7 x2180 y2971 X547.362 Y2918.38 t0 +c n6 N7 x1902 y1684 X763.061 Y1727.18 t0 +c n6 N7 x1391 y1819 X198.204 Y1657.89 t0 +c n7 N8 x1744 y2396 X180.928 Y494.174 t0 +c n7 N8 x2171 y2988 X618.73 Y1099.2 t0 +c n7 N8 x2127 y2380 X621.343 Y516.821 t0 +c n8 N9 x1676 y1749 X514.368 Y1780.82 t0 +c n8 N9 x1927 y400 X217.978 Y404.578 t0 +c n9 N10 x2010 y283 X255.849 Y289.729 t0 +c n9 N10 x1943 y688 X349.056 Y699.418 t0 +c n9 N10 x1749 y1337 X417.821 Y1362.28 t0 +c n9 N10 x1849 y2261 X860.788 Y2163.52 t0 +c n9 N10 x1960 y2585 X1050.04 Y2370.67 t0 +c n10 N11 x1660 y2611 X832.208 Y2558.25 t0 +c n10 N11 x1943 y1576 X677.017 Y1540.6 t0 +c n10 N11 x1721.5 y664 X78 Y662 t0 +c n11 N12 x1880 y1343 X531.143 Y1343.79 t0 +c n11 N12 x2148 y1571 X834.084 Y1489.29 t0 +c n11 N12 x1787 y2321 X823.703 Y2246.36 t0 +c n12 N13 x2061 y2338 X1035.99 Y2135.01 t0 +c n12 N13 x1805 y741 X223.751 Y751.172 t0 +c n13 N14 x1639 y1710 X428.279 Y1764.07 t0 +c n13 N14 x1549 y2543 X698.905 Y2578.95 t0 +c n13 N14 x2205 y1891 X960.088 Y1735.83 t0 +c n14 N15 x2130 y1886 X961.844 Y1749.19 t0 +c n14 N15 x2021 y1090 X610.266 Y1082.87 t0 +c n15 N0 x2057 y1111 X567.944 Y2944.84 t0 +c n2 N3 x2071 y2150 X718.807 Y2174.57 t0 +c n3 N4 x2224 y2184 X828.526 Y2230.7 t0 +c n4 N5 x1657 y1883 X457.67 Y1827.85 t0 +c n4 N5 x1183 y1306 X182.311 Y990.82 t0 +c n4 N5 x1770 y2591 X285.469 Y2559.06 t0 +c n5 N6 x1315 y1624 X186.595 Y1411.37 t0 +c n5 N6 x2021 y1946 X760.051 Y1989.68 t0 +c n6 N7 x1866 y3424 X52.6133 Y3426.44 t0 +c n7 N0 x2188.5 y2992 X569.5 Y2943.5 t0 +c n7 N0 x1851.5 y1604 X764 Y1642 t0 +c n7 N0 x1670 y1889 X490.759 Y1839.97 t0 +c n8 N1 x2003 y1465 X492.874 Y3462.94 t0 +c n8 N1 x1811 y1150 X257.963 Y3019.9 t0 +c n8 N1 x2083 y218 X523.227 Y2205.33 t0 +c n8 N0 x180 y496 X360.205 Y2361.38 t0 +c n8 N0 x617 y1099 X553.287 Y2941.97 t0 +c n8 N9 x1810 y1150 X403.016 Y1166.74 t0 +c n1 N9 x1860 y2943 X1792.27 Y1070.96 t0 +c n2 N9 x387 y2791 X1908.27 Y969.06 t0 +c n2 N9 x511 y2113 X2062 Y58.1009 t0 +c n1 N9 x524 y2208 X308.182 Y246.64 t0 +c n1 N9 x725 y2206 X573.915 Y231.372 t0 +c n2 N10 x511 y2112 X220.075 Y70.6227 t0 +c n2 N10 x509 y3209 X653.005 Y1285.4 t0 +c n3 N10 x597 y3317 X2105.94 Y1396.92 t0 +c n3 N10 x567 y2514 X2132.75 Y666.511 t0 +c n9 N10 x1749.5 y3033 X1059 Y2839 t0 +c n9 N10 x1485 y3237 X940.752 Y3197.07 t0 +c n8 N9 x1546 y3129 X944.073 Y3063.79 t0 +c n8 N9 x1112 y2926 X455.027 Y3279.78 t0 +c n9 N10 x1502 y2088 X484.039 Y2180.79 t0 +c n11 N12 x1679 y1801 X524.994 Y1832.22 t0 +c n11 N12 x1047 y2666 X235.979 Y3103.01 t0 +c n11 N12 x2066 y2950 X1222.63 Y2586.45 t0 +c n12 N13 x1774 y1878 X655.307 Y1864.88 t0 +c n12 N13 x2298 y376.5 X564 Y434.5 t0 +c n13 N14 x1307 y1839 X107.064 Y2048 t0 +c n13 N14 x1220 y2940 X561.594 Y3200.17 t0 +c n6 N14 x1379 y3099 X1315.87 Y1192.47 t0 +c n6 N14 x2179 y2968 X2021.28 Y1087 t0 +c n6 N14 x252 y2664 X202.067 Y862.913 t0 +c n5 N14 x1761 y2577 X163.216 Y729.907 t0 +c n5 N14 x2212 y2698 X616.864 Y857.004 t0 +c n5 N14 x2266 y2205 X719.329 Y307.844 t0 +c n6 N14 x796 y2273 X643.036 Y340.598 t0 +c n7 N14 x550 y2916 X2023.69 Y1087.46 t0 +c n7 N14 x222 y3181 X1748.42 Y1258.06 t0 +c n5 N12 x285 y2561 X1803.13 Y741.11 t0 +c n4 N12 x863 y2591 X841.963 Y762.489 t0 +c n4 N12 x540 y3335 X703.037 Y1359.89 t0 +c n4 N12 x1116 y3229 X1131.81 Y1284.77 t0 +c n3 N12 x2010 y2839 X464.099 Y991.827 t0 +c n3 N12 x2108 y3350 X532.272 Y1344.24 t0 +c n13 N12 x1188.5 y2937 X1841 Y3246.5 t0 +c n11 N12 x1244 y2931 X592.924 Y3158.9 t0 +c n14 N8 x1818.5 y3292.5 X586.5 Y3238.5 t0 +c n14 N6 x825 y1327 X751 Y3283 t0 +c n14 N6 x1074 y888 X1108.18 Y2720.35 t0 +c n15 N6 x728 y896 X2311 Y2746.95 t0 +c n15 N6 x293 y1151 X1801.59 Y3008.56 t0 +c n6 N15 x2198 y2322 X680.142 Y449.797 t0 +c n5 N13 x1385 y2626 X1390.09 Y782.866 t0 +c n5 N13 x1762 y2578 X1799.3 Y723.797 t0 +c n5 N13 x286 y2561 X222.179 Y751.971 t0 +c n15 N8 x2229 y1969 X1041.01 Y1786.75 t0 +c n15 N8 x1869 y1625 X655.756 Y1602.19 t0 +c n15 N8 x1381 y1486 X78.1524 Y1613.67 t0 +c n15 N9 x2121 y2549 X164.924 Y2591.14 t0 +c n7 N8 x1451 y1627 X263.11 Y1802.51 t1 +c n15 N0 x1662 y465 X199 Y2312 t0 +c n15 N0 x1911 y352 X425.165005573559 Y2264.80142095281 t0 + Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/optimizer_everything.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/optimizer_everything.txt (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/optimizer_everything.txt 2010-07-13 01:27:06 UTC (rev 1285) @@ -0,0 +1,743 @@ +# Created by Panotools::Script 0.25 + +p f2 h5755 n"TIFF_m c:NONE" v360 w11640 +m f0 g1 i0 m2 p0.00784314 + +# Image lines +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6556.jpg" p29.5854653922993 r-1.25828188551223 t0 v72.2213 w2336 y0 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6557.jpg" p29.5913706578841 r-0.992326704086645 t0 v72.2213 w2336 y45.5072541329743 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6558.jpg" p29.4014565195123 r-0.774176840542781 t0 v72.2213 w2336 y90.3167925087562 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6559.jpg" p29.1367078566066 r-0.868013771261336 t0 v72.2213 w2336 y135.711689689941 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6560.jpg" p150.973039189246 r178.917940467963 t0 v72.2213 w2336 y0.918212020490364 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6561.jpg" p29.1481002984711 r-1.27292397946249 t0 v72.2213 w2336 y-134.183331339811 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6562.jpg" p29.3070389126475 r-1.34767158643817 t0 v72.2213 w2336 y-89.1548757295396 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6563.jpg" p29.4120521079244 r-1.3736909523997 t0 v72.2213 w2336 y-44.3327611689326 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6564.jpg" p-29.8288972815969 r0.333288092599086 t0 v72.2213 w2336 y0.781911240965593 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6565.jpg" p-29.8408853550192 r0.542509597785516 t0 v72.2213 w2336 y45.5793373867024 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6566.jpg" p-30.0136717198283 r0.723520003300046 t0 v72.2213 w2336 y90.4176380574451 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6567.jpg" p-30.2578224313702 r0.662053082191327 t0 v72.2213 w2336 y135.772969167834 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6568.jpg" p-30.3660104181049 r0.487774538257366 t0 v72.2213 w2336 y-178.713941888217 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6569.jpg" p-30.2774662253677 r0.231699460723244 t0 v72.2213 w2336 y-133.620194210743 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6570.jpg" p-30.0927436500294 r0.153595951940199 t0 v72.2213 w2336 y-87.4938004959903 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6571.jpg" p-29.9525123413865 r0.177318850587939 t0 v72.2213 w2336 y-43.5943548553294 + +# Variable lines +v a0 b0 c0 d0 e0 p0 r0 v0 +v X1 Y1 Z1 p1 r1 y1 +v X2 Y2 Z2 p2 r2 y2 +v X3 Y3 Z3 p3 r3 y3 +v X4 Y4 Z4 p4 r4 y4 +v X5 Y5 Z5 p5 r5 y5 +v X6 Y6 Z6 p6 r6 y6 +v X7 Y7 Z7 p7 r7 y7 +v X8 Y8 Z8 p8 r8 y8 +v X9 Y9 Z9 p9 r9 y9 +v X10 Y10 Z10 p10 r10 y10 +v X11 Y11 Z11 p11 r11 y11 +v X12 Y12 Z12 p12 r12 y12 +v X13 Y13 Z13 p13 r13 y13 +v X14 Y14 Z14 p14 r14 y14 +v + +# Control point lines +c N1 X549.963 Y2078.63 n0 t0 x1850 y2093 +c N1 X256.685 Y3019.8 n0 t0 x1931 y3047 +c N1 X1066.32 Y1551.03 n0 t0 x2190 y1344 +c N2 X1034.5 Y1799.12 n1 t0 x2256 y1639 +c N2 X703.977 Y2460.36 n1 t0 x2156 y2461 +c N2 X131.398 Y2500.93 n1 t0 x1610 y2550 +c N3 X105.82 Y2555.27 n2 t0 x1632 y2601 +c N3 X223 Y2736.5 n2 t0 x1796.5 y2767.5 +c N3 X637.817 Y1423.97 n2 t0 x1674 y1452 +c N4 X191 Y1166.5 n3 t0 x1249 y1434 +c N4 X899.732 Y1721.38 n3 t0 x2067 y1613 +c N4 X322.196 Y3296.01 n3 t0 x2107 y3350 +c N5 X266.114 Y2980.97 n4 t0 x1909 y3005 +c N5 X695.377 Y1523.09 n4 t0 x1755 y1514 +c N5 X323 Y3429.96 n4 t1 x1771 y1591 +c N6 X1032.25 Y1587.2 n5 t0 x2155 y1405 +c N6 X253.763 Y2662.99 n5 t0 x1784 y2694 +c N7 X547.362 Y2918.38 n6 t0 x2180 y2971 +c N7 X763.061 Y1727.18 n6 t0 x1902 y1684 +c N7 X198.204 Y1657.89 n6 t0 x1391 y1819 +c N8 X180.928 Y494.174 n7 t0 x1744 y2396 +c N8 X618.73 Y1099.2 n7 t0 x2171 y2988 +c N8 X621.343 Y516.821 n7 t0 x2127 y2380 +c N9 X514.368 Y1780.82 n8 t0 x1676 y1749 +c N9 X217.978 Y404.578 n8 t0 x1927 y400 +c N10 X255.849 Y289.729 n9 t0 x2010 y283 +c N10 X349.056 Y699.418 n9 t0 x1943 y688 +c N10 X417.821 Y1362.28 n9 t0 x1749 y1337 +c N10 X860.788 Y2163.52 n9 t0 x1849 y2261 +c N10 X1050.04 Y2370.67 n9 t0 x1960 y2585 +c N11 X832.208 Y2558.25 n10 t0 x1660 y2611 +c N11 X677.017 Y1540.6 n10 t0 x1943 y1576 +c N11 X78 Y662 n10 t0 x1721.5 y664 +c N12 X531.143 Y1343.79 n11 t0 x1880 y1343 +c N12 X834.084 Y1489.29 n11 t0 x2148 y1571 +c N12 X823.703 Y2246.36 n11 t0 x1787 y2321 +c N13 X1035.99 Y2135.01 n12 t0 x2061 y2338 +c N13 X223.751 Y751.172 n12 t0 x1805 y741 +c N14 X428.279 Y1764.07 n13 t0 x1639 y1710 +c N14 X698.905 Y2578.95 n13 t0 x1549 y2543 +c N14 X960.088 Y1735.83 n13 t0 x2205 y1891 +c N15 X961.844 Y1749.19 n14 t0 x2130 y1886 +c N15 X610.266 Y1082.87 n14 t0 x2021 y1090 +c N0 X567.944 Y2944.84 n15 t0 x2057 y1111 +c N3 X718.807 Y2174.57 n2 t0 x2071 y2150 +c N4 X828.526 Y2230.7 n3 t0 x2224 y2184 +c N5 X457.67 Y1827.85 n4 t0 x1657 y1883 +c N5 X182.311 Y990.82 n4 t0 x1183 y1306 +c N5 X285.469 Y2559.06 n4 t0 x1770 y2591 +c N6 X186.595 Y1411.37 n5 t0 x1315 y1624 +c N6 X760.051 Y1989.68 n5 t0 x2021 y1946 +c N7 X52.6133 Y3426.44 n6 t0 x1866 y3424 +c N0 X569.5 Y2943.5 n7 t0 x2188.5 y2992 +c N0 X764 Y1642 n7 t0 x1851.5 y1604 +c N0 X490.759 Y1839.97 n7 t0 x1670 y1889 +c N1 X492.874 Y3462.94 n8 t0 x2003 y1465 +c N1 X257.963 Y3019.9 n8 t0 x1811 y1150 +c N1 X523.227 Y2205.33 n8 t0 x2083 y218 +c N0 X360.205 Y2361.38 n8 t0 x180 y496 +c N0 X553.287 Y2941.97 n8 t0 x617 y1099 +c N9 X403.016 Y1166.74 n8 t0 x1810 y1150 +c N9 X1792.27 Y1070.96 n1 t0 x1860 y2943 +c N9 X1908.27 Y969.06 n2 t0 x387 y2791 +c N9 X2062 Y58.1009 n2 t0 x511 y2113 +c N9 X308.182 Y246.64 n1 t0 x524 y2208 +c N9 X573.915 Y231.372 n1 t0 x725 y2206 +c N10 X220.075 Y70.6227 n2 t0 x511 y2112 +c N10 X653.005 Y1285.4 n2 t0 x509 y3209 +c N10 X2105.94 Y1396.92 n3 t0 x597 y3317 +c N10 X2132.75 Y666.511 n3 t0 x567 y2514 +c N10 X1059 Y2839 n9 t0 x1749.5 y3033 +c N10 X940.752 Y3197.07 n9 t0 x1485 y3237 +c N9 X944.073 Y3063.79 n8 t0 x1546 y3129 +c N9 X455.027 Y3279.78 n8 t0 x1112 y2926 +c N10 X484.039 Y2180.79 n9 t0 x1502 y2088 +c N12 X524.994 Y1832.22 n11 t0 x1679 y1801 +c N12 X235.979 Y3103.01 n11 t0 x1047 y2666 +c N12 X1222.63 Y2586.45 n11 t0 x2066 y2950 +c N13 X655.307 Y1864.88 n12 t0 x1774 y1878 +c N13 X564 Y434.5 n12 t0 x2298 y376.5 +c N14 X107.064 Y2048 n13 t0 x1307 y1839 +c N14 X561.594 Y3200.17 n13 t0 x1220 y2940 +c N14 X1315.87 Y1192.47 n6 t0 x1379 y3099 +c N14 X2021.28 Y1087 n6 t0 x2179 y2968 +c N14 X202.067 Y862.913 n6 t0 x252 y2664 +c N14 X163.216 Y729.907 n5 t0 x1761 y2577 +c N14 X616.864 Y857.004 n5 t0 x2212 y2698 +c N14 X719.329 Y307.844 n5 t0 x2266 y2205 +c N14 X643.036 Y340.598 n6 t0 x796 y2273 +c N14 X2023.69 Y1087.46 n7 t0 x550 y2916 +c N14 X1748.42 Y1258.06 n7 t0 x222 y3181 +c N12 X1803.13 Y741.11 n5 t0 x285 y2561 +c N12 X841.963 Y762.489 n4 t0 x863 y2591 +c N12 X703.037 Y1359.89 n4 t0 x540 y3335 +c N12 X1131.81 Y1284.77 n4 t0 x1116 y3229 +c N12 X464.099 Y991.827 n3 t0 x2010 y2839 +c N12 X532.272 Y1344.24 n3 t0 x2108 y3350 +c N12 X1841 Y3246.5 n13 t0 x1188.5 y2937 +c N12 X592.924 Y3158.9 n11 t0 x1244 y2931 +c N8 X586.5 Y3238.5 n14 t0 x1818.5 y3292.5 +c N6 X751 Y3283 n14 t0 x825 y1327 +c N6 X1108.18 Y2720.35 n14 t0 x1074 y888 +c N6 X2311 Y2746.95 n15 t0 x728 y896 +c N6 X1801.59 Y3008.56 n15 t0 x293 y1151 +c N15 X680.142 Y449.797 n6 t0 x2198 y2322 +c N13 X1390.09 Y782.866 n5 t0 x1385 y2626 +c N13 X1799.3 Y723.797 n5 t0 x1762 y2578 +c N13 X222.179 Y751.971 n5 t0 x286 y2561 +c N8 X1041.01 Y1786.75 n15 t0 x2229 y1969 +c N8 X655.756 Y1602.19 n15 t0 x1869 y1625 +c N8 X78.1524 Y1613.67 n15 t0 x1381 y1486 +c N9 X164.924 Y2591.14 n15 t0 x2121 y2549 +c N8 X263.11 Y1802.51 n7 t1 x1451 y1627 +c N0 X199 Y2312 n15 t0 x1662 y465 +c N0 X425.165005573559 Y2264.80142095281 n15 t0 x1911 y352 + +* + +# ==================================================================== +# Output generated by Panorama Tools + +# 311 function evaluations +# the relative error in the sum of squares is at most tol +# final rms error 1.05294 units + +# Panorama description +# p f2 w11640 h5755 v360 n"TIFF_m c:NONE" + +# Parameters for Each Input Image: +# (*) - optimized (p) - preset + +# Image No 0: +# Yaw: 0 deg (p) Pitch: 29.8282 deg (*) +# Roll: -1.27551 deg (*) HFov: 72.2151 deg (*) +# Polynomial Coefficients: a -0.003461 (*); b -0.011810 (*); c 0.008008 (*) +# Horizontal Shift: -6.449926 (*) Vertical Shift: 21.985130 (*) +# TiltX: 0.000000 (p) TiltY: 0.000000 (p) +# TiltZ: 0.000000 (p) TiltScale: 1.000000 (p) +# TransX: 0.000000 (p) TransY: 0.000000 (p) +# TransZ: 0.000000 (p) +# Test P0: 0.000000 (p) Test P1: 0.000000 (p) +# Test P2: 0.000000 (p) Test P3: 0.000000 (p) +# 4th polynomial coefficient: 1.00726 +# Command for Panorama Creation: +o f0 r-1.27551 p29.8282 y0 v72.2151 a-0.003461 b-0.011810 c0.008008 g0.000000 t0.000000 d-6.449926 e21.985130 u10 -buf + +# Image No 1: +# Yaw: 45.4791 deg (*) Pitch: 29.5943 deg (*) +# Roll: -1.01444 deg (*) HFov: 72.2213 deg (p) +# Polynomial Coefficients: a 0.002796 (p); b -0.014182 (p); c 0.002121 (p) +# Horizontal Shift: -7.950080 (p) Vertical Shift: 29.730000 (p) +# TiltX: 0.000000 (p) TiltY: 0.000000 (p) +# TiltZ: 0.000000 (p) TiltScale: 1.000000 (p) +# TransX: 0.000000 (p) TransY: 0.000000 (p) +# TransZ: 0.000000 (p) +# Test P0: 0.000000 (p) Test P1: 0.000000 (p) +# Test P2: 0.000000 (p) Test P3: 0.000000 (p) +# Command for Panorama Creation: +o f0 r-1.01444 p29.5943 y45.4791 v72.2213 a0.002796 b-0.014182 c0.002121 g0.000000 t0.000000 d-7.950080 e29.730000 u10 +buf -buf + +# Image No 2: +# Yaw: 90.3008 deg (*) Pitch: 29.4115 deg (*) +# Roll: -0.77738 deg (*) HFov: 72.2213 deg (p) +# Polynomial Coefficients: a 0.002796 (p); b -0.014182 (p); c 0.002121 (p) +# Horizontal Shift: -7.950080 (p) Vertical Shift: 29.730000 (p) +# TiltX: 0.000000 (p) TiltY: 0.000000 (p) +# TiltZ: 0.000000 (p) TiltScale: 1.000000 (p) +# TransX: 0.000000 (p) TransY: 0.000000 (p) +# TransZ: 0.000000 (p) +# Test P0: 0.000000 (p) Test P1: 0.000000 (p) +# Test P2: 0.000000 (p) Test P3: 0.000000 (p) +# Command for Panorama Creation: +o f0 r-0.77738 p29.4115 y90.3008 v72.2213 a0.002796 b-0.014182 c0.002121 g0.000000 t0.000000 d-7.950080 e29.730000 u10 +buf -buf + +# Image No 3: +# Yaw: 135.703 deg (*) Pitch: 29.1439 deg (*) +# Roll: -0.860517 deg (*) HFov: 72.2213 deg (p) +# Polynomial Coefficients: a 0.002796 (p); b -0.014182 (p); c 0.002121 (p) +# Horizontal Shift: -7.950080 (p) Vertical Shift: 29.730000 (p) +# TiltX: 0.000000 (p) TiltY: 0.000000 (p) +# TiltZ: 0.000000 (p) TiltScale: 1.000000 (p) +# TransX: 0.000000 (p) TransY: 0.000000 (p) +# TransZ: 0.000000 (p) +# Test P0: 0.000000 (p) Test P1: 0.000000 (p) +# Test P2: 0.000000 (p) Test P3: 0.000000 (p) +# Command for Panorama Creation: +o f0 r-0.860517 p29.1439 y135.703 v72.2213 a0.002796 b-0.014182 c0.002121 g0.000000 t0.000000 d-7.950080 e29.730000 u10 +buf -buf + +# Image No 4: +# Yaw: 0.912187 deg (*) Pitch: 150.973 deg (*) +# Roll: 178.927 deg (*) HFov: 72.2213 deg (p) +# Polynomial Coefficients: a 0.002796 (p); b -0.014182 (p); c 0.002121 (p) +# Horizontal Shift: -7.950080 (p) Vertical Shift: 29.730000 (p) +# TiltX: 0.000000 (p) TiltY: 0.000000 (p) +# TiltZ: 0.000000 (p) TiltScale: 1.000000 (p) +# TransX: 0.000000 (p) TransY: 0.000000 (p) +# TransZ: 0.000000 (p) +# Test P0: 0.000000 (p) Test P1: 0.000000 (p) +# Test P2: 0.000000 (p) Test P3: 0.000000 (p) +# Command for Panorama Creation: +o f0 r178.927 p150.973 y0.912187 v72.2213 a0.002796 b-0.014182 c0.002121 g0.000000 t0.000000 d-7.950080 e29.730000 u10 +buf -buf + +# Image No 5: +# Yaw: -134.189 deg (*) Pitch: 29.1438 deg (*) +# Roll: -1.26857 deg (*) HFov: 72.2213 deg (p) +# Polynomial Coefficients: a 0.002796 (p); b -0.014182 (p); c 0.002121 (p) +# Horizontal Shift: -7.950080 (p) Vertical Shift: 29.730000 (p) +# TiltX: 0.000000 (p) TiltY: 0.000000 (p) +# TiltZ: 0.000000 (p) TiltScale: 1.000000 (p) +# TransX: 0.000000 (p) TransY: 0.000000 (p) +# TransZ: 0.000000 (p) +# Test P0: 0.000000 (p) Test P1: 0.000000 (p) +# Test P2: 0.000000 (p) Test P3: 0.000000 (p) +# Command for Panorama Creation: +o f0 r-1.26857 p29.1438 y-134.189 v72.2213 a0.002796 b-0.014182 c0.002121 g0.000000 t0.000000 d-7.950080 e29.730000 u10 +buf -buf + +# Image No 6: +# Yaw: -89.1614 deg (*) Pitch: 29.3015 deg (*) +# Roll: -1.34939 deg (*) HFov: 72.2213 deg (p) +# Polynomial Coefficients: a 0.002796 (p); b -0.014182 (p); c 0.002121 (p) +# Horizontal Shift: -7.950080 (p) Vertical Shift: 29.730000 (p) +# TiltX: 0.000000 (p) TiltY: 0.000000 (p) +# TiltZ: 0.000000 (p) TiltScale: 1.000000 (p) +# TransX: 0.000000 (p) TransY: 0.000000 (p) +# TransZ: 0.000000 (p) +# Test P0: 0.000000 (p) Test P1: 0.000000 (p) +# Test P2: 0.000000 (p) Test P3: 0.000000 (p) +# Command for Panorama Creation: +o f0 r-1.34939 p29.3015 y-89.1614 v72.2213 a0.002796 b-0.014182 c0.002121 g0.000000 t0.000000 d-7.950080 e29.730000 u10 +buf -buf + +# Image No 7: +# Yaw: -44.3433 deg (*) Pitch: 29.4049 deg (*) +# Roll: -1.37828 deg (*) HFov: 72.2213 deg (p) +# Polynomial Coefficients: a 0.002796 (p); b -0.014182 (p); c 0.002121 (p) +# Horizontal Shift: -7.950080 (p) Vertical Shift: 29.730000 (p) +# TiltX: 0.000000 (p) TiltY: 0.000000 (p) +# TiltZ: 0.000000 (p) TiltScale: 1.000000 (p) +# TransX: 0.000000 (p) TransY: 0.000000 (p) +# TransZ: 0.000000 (p) +# Test P0: 0.000000 (p) Test P1: 0.000000 (p) +# Test P2: 0.000000 (p) Test P3: 0.000000 (p) +# Command for Panorama Creation: +o f0 r-1.37828 p29.4049 y-44.3433 v72.2213 a0.002796 b-0.014182 c0.002121 g0.000000 t0.000000 d-7.950080 e29.730000 u10 +buf -buf + +# Image No 8: +# Yaw: 0.775875 deg (*) Pitch: -29.8288 deg (*) +# Roll: 0.331384 deg (*) HFov: 72.2213 deg (p) +# Polynomial Coefficients: a 0.002796 (p); b -0.014182 (p); c 0.002121 (p) +# Horizontal Shift: -7.950080 (p) Vertical Shift: 29.730000 (p) +# TiltX: 0.000000 (p) TiltY: 0.000000 (p) +# TiltZ: 0.000000 (p) TiltScale: 1.000000 (p) +# TransX: 0.000000 (p) TransY: 0.000000 (p) +# TransZ: 0.000000 (p) +# Test P0: 0.000000 (p) Test P1: 0.000000 (p) +# Test P2: 0.000000 (p) Test P3: 0.000000 (p) +# Command for Panorama Creation: +o f0 r0.331384 p-29.8288 y0.775875 v72.2213 a0.002796 b-0.014182 c0.002121 g0.000000 t0.000000 d-7.950080 e29.730000 u10 +buf -buf + +# Image No 9: +# Yaw: 45.5703 deg (*) Pitch: -29.8367 deg (*) +# Roll: 0.533507 deg (*) HFov: 72.2213 deg (p) +# Polynomial Coefficients: a 0.002796 (p); b -0.014182 (p); c 0.002121 (p) +# Horizontal Shift: -7.950080 (p) Vertical Shift: 29.730000 (p) +# TiltX: 0.000000 (p) TiltY: 0.000000 (p) +# TiltZ: 0.000000 (p) TiltScale: 1.000000 (p) +# TransX: 0.000000 (p) TransY: 0.000000 (p) +# TransZ: 0.000000 (p) +# Test P0: 0.000000 (p) Test P1: 0.000000 (p) +# Test P2: 0.000000 (p) Test P3: 0.000000 (p) +# Command for Panorama Creation: +o f0 r0.533507 p-29.8367 y45.5703 v72.2213 a0.002796 b-0.014182 c0.002121 g0.000000 t0.000000 d-7.950080 e29.730000 u10 +buf -buf + +# Image No 10: +# Yaw: 90.4059 deg (*) Pitch: -30.0053 deg (*) +# Roll: 0.721215 deg (*) HFov: 72.2213 deg (p) +# Polynomial Coefficients: a 0.002796 (p); b -0.014182 (p); c 0.002121 (p) +# Horizontal Shift: -7.950080 (p) Vertical Shift: 29.730000 (p) +# TiltX: 0.000000 (p) TiltY: 0.000000 (p) +# TiltZ: 0.000000 (p) TiltScale: 1.000000 (p) +# TransX: 0.000000 (p) TransY: 0.000000 (p) +# TransZ: 0.000000 (p) +# Test P0: 0.000000 (p) Test P1: 0.000000 (p) +# Test P2: 0.000000 (p) Test P3: 0.000000 (p) +# Command for Panorama Creation: +o f0 r0.721215 p-30.0053 y90.4059 v72.2213 a0.002796 b-0.014182 c0.002121 g0.000000 t0.000000 d-7.950080 e29.730000 u10 +buf -buf + +# Image No 11: +# Yaw: 135.759 deg (*) Pitch: -30.2518 deg (*) +# Roll: 0.668144 deg (*) HFov: 72.2213 deg (p) +# Polynomial Coefficients: a 0.002796 (p); b -0.014182 (p); c 0.002121 (p) +# Horizontal Shift: -7.950080 (p) Vertical Shift: 29.730000 (p) +# TiltX: 0.000000 (p) TiltY: 0.000000 (p) +# TiltZ: 0.000000 (p) TiltScale: 1.000000 (p) +# TransX: 0.000000 (p) TransY: 0.000000 (p) +# TransZ: 0.000000 (p) +# Test P0: 0.000000 (p) Test P1: 0.000000 (p) +# Test P2: 0.000000 (p) Test P3: 0.000000 (p) +# Command for Panorama Creation: +o f0 r0.668144 p-30.2518 y135.759 v72.2213 a0.002796 b-0.014182 c0.002121 g0.000000 t0.000000 d-7.950080 e29.730000 u10 +buf -buf + +# Image No 12: +# Yaw: -178.728 deg (*) Pitch: -30.3658 deg (*) +# Roll: 0.496931 deg (*) HFov: 72.2213 deg (p) +# Polynomial Coefficients: a 0.002796 (p); b -0.014182 (p); c 0.002121 (p) +# Horizontal Shift: -7.950080 (p) Vertical Shift: 29.730000 (p) +# TiltX: 0.000000 (p) TiltY: 0.000000 (p) +# TiltZ: 0.000000 (p) TiltScale: 1.000000 (p) +# TransX: 0.000000 (p) TransY: 0.000000 (p) +# TransZ: 0.000000 (p) +# Test P0: 0.000000 (p) Test P1: 0.000000 (p) +# Test P2: 0.000000 (p) Test P3: 0.000000 (p) +# Command for Panorama Creation: +o f0 r0.496931 p-30.3658 y-178.728 v72.2213 a0.002796 b-0.014182 c0.002121 g0.000000 t0.000000 d-7.950080 e29.730000 u10 +buf -buf + +# Image No 13: +# Yaw: -133.631 deg (*) Pitch: -30.2823 deg (*) +# Roll: 0.236081 deg (*) HFov: 72.2213 deg (p) +# Polynomial Coefficients: a 0.002796 (p); b -0.014182 (p); c 0.002121 (p) +# Horizontal Shift: -7.950080 (p) Vertical Shift: 29.730000 (p) +# TiltX: 0.000000 (p) TiltY: 0.000000 (p) +# TiltZ: 0.000000 (p) TiltScale: 1.000000 (p) +# TransX: 0.000000 (p) TransY: 0.000000 (p) +# TransZ: 0.000000 (p) +# Test P0: 0.000000 (p) Test P1: 0.000000 (p) +# Test P2: 0.000000 (p) Test P3: 0.000000 (p) +# Command for Panorama Creation: +o f0 r0.236081 p-30.2823 y-133.631 v72.2213 a0.002796 b-0.014182 c0.002121 g0.000000 t0.000000 d-7.950080 e29.730000 u10 +buf -buf + +# Image No 14: +# Yaw: -87.4997 deg (*) Pitch: -30.0983 deg (*) +# Roll: 0.152395 deg (*) HFov: 72.2213 deg (p) +# Polynomial Coefficients: a 0.002796 (p); b -0.014182 (p); c 0.002121 (p) +# Horizontal Shift: -7.950080 (p) Vertical Shift: 29.730000 (p) +# TiltX: 0.000000 (p) TiltY: 0.000000 (p) +# TiltZ: 0.000000 (p) TiltScale: 1.000000 (p) +# TransX: 0.000000 (p) TransY: 0.000000 (p) +# TransZ: 0.000000 (p) +# Test P0: 0.000000 (p) Test P1: 0.000000 (p) +# Test P2: 0.000000 (p) Test P3: 0.000000 (p) +# Command for Panorama Creation: +o f0 r0.152395 p-30.0983 y-87.4997 v72.2213 a0.002796 b-0.014182 c0.002121 g0.000000 t0.000000 d-7.950080 e29.730000 u10 +buf -buf + +# Image No 15: +# Yaw: -43.5944 deg (p) Pitch: -29.9525 deg (p) +# Roll: 0.177319 deg (p) HFov: 72.2213 deg (p) +# Polynomial Coefficients: a 0.002796 (p); b -0.014182 (p); c 0.002121 (p) +# Horizontal Shift: -7.950080 (p) Vertical Shift: 29.730000 (p) +# TiltX: 0.000000 (p) TiltY: 0.000000 (p) +# TiltZ: 0.000000 (p) TiltScale: 1.000000 (p) +# TransX: 0.000000 (p) TransY: 0.000000 (p) +# TransZ: 0.000000 (p) +# Test P0: 0.000000 (p) Test P1: 0.000000 (p) +# Test P2: 0.000000 (p) Test P3: 0.000000 (p) +# Command for Panorama Creation: +o f0 r0.177319 p-29.9525 y-43.5944 v72.2213 a0.002796 b-0.014182 c0.002121 g0.000000 t0.000000 d-7.950080 e29.730000 u10 +buf + + +# ========================================================================== +# Control Points: Distance between desired and fitted Position (in "Pixels") + +# Control Point No 0: 1.14807 +# Control Point No 1: 0.355968 +# Control Point No 2: 0.996379 +# Control Point No 3: 0.85138 +# Control Point No 4: 0.485635 +# Control Point No 5: 0.355643 +# Control Point No 6: 0.73478 +# Control Point No 7: 0.671113 +# Control Point No 8: 1.41998 +# Control Point No 9: 2.16021 +# Control Point No 10: 0.411924 +# Control Point No 11: 0.527694 +# Control Point No 12: 0.182353 +# Control Point No 13: 0.674899 +# Control Point No 14: 0.118789 +# Control Point No 15: 0.710025 +# Control Point No 16: 1.05541 +# Control Point No 17: 0.610194 +# Control Point No 18: 0.96949 +# Control Point No 19: 0.762861 +# Control Point No 20: 0.761958 +# Control Point No 21: 2.22165 +# Control Point No 22: 0.981093 +# Control Point No 23: 0.143468 +# Control Point No 24: 2.02649 +# Control Point No 25: 1.35122 +# Control Point No 26: 0.808596 +# Control Point No 27: 1.70083 +# Control Point No 28: 0.630947 +# Control Point No 29: 0.825967 +# Control Point No 30: 0.691806 +# Control Point No 31: 0.473718 +# Control Point No 32: 1.03061 +# Control Point No 33: 1.18842 +# Control Point No 34: 0.170176 +# Control Point No 35: 0.283127 +# Control Point No 36: 0.101795 +# Control Point No 37: 0.353118 +# Control Point No 38: 1.1277 +# Control Point No 39: 0.819318 +# Control Point No 40: 1.79379 +# Control Point No 41: 1.1445 +# Control Point No 42: 0.67307 +# Control Point No 43: 0.851458 +# Control Point No 44: 0.394209 +# Control Point No 45: 1.05485 +# Control Point No 46: 0.990678 +# Control Point No 47: 1.094 +# Control Point No 48: 1.01267 +# Control Point No 49: 2.16125 +# Control Point No 50: 1.23395 +# Control Point No 51: 0.244979 +# Control Point No 52: 2.56051 +# Control Point No 53: 1.37343 +# Control Point No 54: 1.09547 +# Control Point No 55: 0.855517 +# Control Point No 56: 0.301609 +# Control Point No 57: 1.69382 +# Control Point No 58: 0.910382 +# Control Point No 59: 0.961587 +# Control Point No 60: 0.556115 +# Control Point No 61: 0.355662 +# Control Point No 62: 0.107254 +# Control Point No 63: 1.51029 +# Control Point No 64: 0.736441 +# Control Point No 65: 0.780219 +# Control Point No 66: 0.980105 +# Control Point No 67: 0.0700322 +# Control Point No 68: 0.849046 +# Control Point No 69: 1.29822 +# Control Point No 70: 0.948449 +# Control Point No 71: 1.09454 +# Control Point No 72: 1.24307 +# Control Point No 73: 1.17302 +# Control Point No 74: 0.268502 +# Control Point No 75: 0.28685 +# Control Point No 76: 0.51104 +# Control Point No 77: 0.42335 +# Control Point No 78: 0.803887 +# Control Point No 79: 2.13133 +# Control Point No 80: 1.0607 +# Control Point No 81: 1.23129 +# Control Point No 82: 1.1598 +# Control Point No 83: 0.904865 +# Control Point No 84: 2.14069 +# Control Point No 85: 1.02398 +# Control Point No 86: 0.810542 +# Control Point No 87: 1.10691 +# Control Point No 88: 2.00479 +# Control Point No 89: 1.24337 +# Control Point No 90: 1.20027 +# Control Point No 91: 0.721474 +# Control Point No 92: 0.486017 +# Control Point No 93: 0.667079 +# Control Point No 94: 0.636103 +# Control Point No 95: 0.699961 +# Control Point No 96: 0.272224 +# Control Point No 97: 1.43621 +# Control Point No 98: 1.50934 +# Control Point No 99: 1.25391 +# Control Point No 100: 1.13426 +# Control Point No 101: 0.946658 +# Control Point No 102: 0.886187 +# Control Point No 103: 0.264395 +# Control Point No 104: 0.625327 +# Control Point No 105: 1.01721 +# Control Point No 106: 0.0964769 +# Control Point No 107: 0.843472 +# Control Point No 108: 1.18494 +# Control Point No 109: 0.826906 +# Control Point No 110: 0.862638 +# Control Point No 111: 0.755549 +# Control Point No 112: 0.186643 +# Control Point No 113: 1.53566 +# Control Point No 114: 1.31607 +C i0 c0 x6601.47 y2308.86 X6602.07 Y2308.86 D1.14807 Dx-1.14807 Dy-0.00089787 +C i1 c0 x6602.67 y2308.86 X6602.07 Y2308.86 D1.14807 Dx-1.14807 Dy-0.00089787 +C i0 c1 x6522.6 y3133.86 X6522.55 Y3133.69 D0.355968 Dx0.0901051 Dy0.344375 +C i1 c1 x6522.51 y3133.51 X6522.55 Y3133.69 D0.355968 Dx0.0901051 Dy0.344375 +C i0 c2 x7150.33 y1663.3 X7150.55 Y1662.83 D0.996379 Dx-0.334253 Dy0.93864 +C i1 c2 x7150.76 y1662.36 X7150.55 Y1662.83 D0.996379 Dx-0.334253 Dy0.93864 +C i1 c3 x8576.19 y1952.28 X8576.36 Y1951.89 D0.85138 Dx-0.304116 Dy0.795211 +C i2 c3 x8576.53 y1951.49 X8576.36 Y1951.89 D0.85138 Dx-0.304116 Dy0.795211 +C i1 c4 x8273.07 y2678.24 X8273.31 Y2678.31 D0.485635 Dx-0.463365 Dy-0.145378 +C i2 c4 x8273.54 y2678.38 X8273.31 Y2678.31 D0.485635 Dx-0.463365 Dy-0.145378 +C i1 c5 x7764.08 y2743.45 X7764.21 Y2743.57 D0.355643 Dx-0.265561 Dy-0.236558 +C i2 c5 x7764.35 y2743.69 X7764.21 Y2743.57 D0.355643 Dx-0.265561 Dy-0.236558 +C i2 c6 x9225.76 y2797.15 X9225.9 Y2797.49 D0.73478 Dx-0.286844 Dy-0.676478 +C i3 c6 x9226.05 y2797.83 X9225.9 Y2797.49 D0.73478 Dx-0.286844 Dy-0.676478 +C i2 c7 x9357.77 y2937.99 X9357.48 Y2938.16 D0.671113 Dx0.585612 Dy-0.327797 +C i3 c7 x9357.19 y2938.32 X9357.48 Y2938.16 D0.671113 Dx0.585612 Dy-0.327797 +C i2 c8 x9462.37 y1616.54 X9461.91 Y1615.93 D1.41998 Dx0.726488 Dy1.22007 +C i3 c8 x9461.44 y1615.32 X9461.91 Y1615.93 D1.41998 Dx0.726488 Dy1.22007 +C i3 c9 x10332.8 y1543.03 X10331.4 Y1543.3 D2.16021 Dx2.09193 Dy-0.538841 +C i4 c9 x10330 y1543.56 X10331.4 Y1543.3 D2.16021 Dx2.09193 Dy-0.538841 +C i3 c10 x11323.9 y1889.82 X11324.1 Y1889.72 D0.411924 Dx-0.351996 Dy0.213964 +C i4 c10 x11324.3 y1889.61 X11324.1 Y1889.72 D0.411924 Dx-0.351996 Dy0.213964 +C i3 c11 x10996.7 y3330.8 X10996.5 Y3330.65 D0.527694 Dx0.435943 Dy0.297346 +C i4 c11 x10996.3 y3330.5 X10996.5 Y3330.65 D0.527694 Dx0.435943 Dy0.297346 +C i4 c12 x717.717 y3123.16 X717.808 Y3123.17 D0.182353 Dx-0.181405 Dy-0.018569 +C i5 c12 x717.9 y3123.18 X717.808 Y3123.17 D0.182353 Dx-0.181405 Dy-0.018569 +C i4 c13 x832.806 y1708.57 X832.888 Y1708.24 D0.674899 Dx-0.132264 Dy0.661812 +C i5 c13 x832.969 y1707.91 X832.888 Y1708.24 D0.674899 Dx-0.132264 Dy0.661812 +C i5 c15 x2750.71 y1715.99 X2751.15 Y1716.01 D0.710025 Dx-0.708856 Dy-0.0407361 +C i6 c15 x2751.59 y1716.03 X2751.15 Y1716.01 D0.710025 Dx-0.708856 Dy-0.0407361 +C i5 c16 x2105.7 y2881.25 X2105.19 Y2881.37 D1.05541 Dx1.02415 Dy-0.254963 +C i6 c16 x2104.68 y2881.5 X2105.19 Y2881.37 D1.05541 Dx1.02415 Dy-0.254963 +C i6 c17 x3847.56 y3074.93 X3847.79 Y3074.73 D0.610194 Dx-0.463251 Dy0.397159 +C i7 c17 x3848.03 y3074.53 X3847.79 Y3074.73 D0.610194 Dx-0.463251 Dy0.397159 +C i6 c18 x3866.69 y1906.82 X3867.18 Y1907.05 D0.96949 Dx-0.846471 Dy-0.472648 +C i7 c18 x3867.67 y1907.29 X3867.18 Y1907.05 D0.96949 Dx-0.846471 Dy-0.472648 +C i6 c19 x3235.98 y1976.7 X3236.34 Y1976.91 D0.762861 Dx-0.63811 Dy-0.418058 +C i7 c19 x3236.71 y1977.11 X3236.34 Y1976.91 D0.762861 Dx-0.63811 Dy-0.418058 +C i7 c20 x5014.8 y2604.55 X5014.79 Y2604.94 D0.761958 Dx0.0200955 Dy-0.761693 +C i8 c20 x5014.78 y2605.32 X5014.79 Y2604.94 D0.761958 Dx0.0200955 Dy-0.761693 +C i7 c21 x5287.49 y3083.74 X5288.16 Y3084.63 D2.22165 Dx-1.33304 Dy-1.77728 +C i8 c21 x5288.83 y3085.52 X5288.16 Y3084.63 D2.22165 Dx-1.33304 Dy-1.77728 +C i7 c22 x5366.3 y2607.08 X5366.79 Y2607.02 D0.981093 Dx-0.97407 Dy0.117181 +C i8 c22 x5367.28 y2606.96 X5366.79 Y2607.02 D0.981093 Dx-0.97407 Dy0.117181 +C i8 c23 x6493.45 y3759.75 X6493.52 Y3759.77 D0.143468 Dx-0.140525 Dy-0.0289062 +C i9 c23 x6493.6 y3759.78 X6493.52 Y3759.77 D0.143468 Dx-0.140525 Dy-0.0289062 +C i8 c24 x6510.37 y2541.58 X6510.34 Y2542.59 D2.02649 Dx0.0689819 Dy-2.02531 +C i9 c24 x6510.3 y2543.6 X6510.34 Y2542.59 D2.02649 Dx0.0689819 Dy-2.02531 +C i9 c25 x8011.15 y2475.12 X8011.23 Y2474.45 D1.35122 Dx-0.154562 Dy1.34236 +C i10 c25 x8011.31 y2473.78 X8011.23 Y2474.45 D1.35122 Dx-0.154562 Dy1.34236 +C i9 c26 x8017.3 y2745.85 X8017.02 Y2746.13 D0.808596 Dx0.574802 Dy-0.568709 +C i10 c26 x8016.73 y2746.42 X8017.02 Y2746.13 D0.808596 Dx0.574802 Dy-0.568709 +C i9 c27 x7945.4 y3321.09 X7945.95 Y3321.75 D1.70083 Dx-1.06999 Dy-1.3221 +C i10 c27 x7946.5 y3322.41 X7945.95 Y3321.75 D1.70083 Dx-1.06999 Dy-1.3221 +C i9 c28 x8285.78 y4245.75 X8286.21 Y4245.73 D0.630947 Dx-0.628442 Dy0.0561674 +C i10 c28 x8286.63 y4245.7 X8286.21 Y4245.73 D0.630947 Dx-0.628442 Dy0.0561674 +C i9 c29 x8547.66 y4489.28 X8547.25 Y4489.6 D0.825967 Dx0.529949 Dy-0.633542 +C i10 c29 x8546.84 y4489.91 X8547.25 Y4489.6 D0.825967 Dx0.529949 Dy-0.633542 +C i10 c30 x9607.24 y4639.36 X9607.51 Y4639.05 D0.691806 Dx-0.313922 Dy0.61648 +C i11 c30 x9607.78 y4638.75 X9607.51 Y4639.05 D0.691806 Dx-0.313922 Dy0.61648 +C i10 c31 x9641.35 y3544.89 X9641.6 Y3544.89 D0.473718 Dx-0.473578 Dy0.0115108 +C i11 c31 x9641.86 y3544.88 X9641.6 Y3544.89 D0.473718 Dx-0.473578 Dy0.0115108 +C i10 c32 x9277.32 y2729.3 X9277.7 Y2729.66 D1.03061 Dx-0.747435 Dy-0.709574 +C i11 c32 x9278.07 y2730.01 X9277.7 Y2729.66 D1.03061 Dx-0.747435 Dy-0.709574 +C i11 c33 x10995.2 y3329.33 X10995.6 Y3329.71 D1.18842 Dx-0.910662 Dy-0.763566 +C i12 c33 x10996.1 y3330.09 X10995.6 Y3329.71 D1.18842 Dx-0.910662 Dy-0.763566 +C i11 c34 x11298.3 y3511.46 X11298.2 Y3511.52 D0.170176 Dx0.127679 Dy-0.112508 +C i12 c34 x11298.1 y3511.57 X11298.2 Y3511.52 D0.170176 Dx0.127679 Dy-0.112508 +C i11 c35 x11151.3 y4337.48 X11151.5 Y4337.56 D0.283127 Dx-0.232069 Dy-0.162188 +C i12 c35 x11151.7 y4337.64 X11151.5 Y4337.56 D0.283127 Dx-0.232069 Dy-0.162188 +C i12 c36 x1308.92 y4250.21 X1308.98 Y4250.23 D0.101795 Dx-0.0882781 Dy-0.0506866 +C i13 c36 x1309.04 y4250.26 X1308.98 Y4250.23 D0.101795 Dx-0.0882781 Dy-0.0506866 +C i12 c37 x654.173 y2799.73 X654.013 Y2799.65 D0.353118 Dx0.318884 Dy0.151674 +C i13 c37 x653.854 y2799.58 X654.013 Y2799.65 D0.353118 Dx0.318884 Dy0.151674 +C i13 c38 x2099 y3736.44 X2099.58 Y3736.22 D1.1277 Dx-1.03872 Dy0.43906 +C i14 c38 x2100.16 y3736 X2099.58 Y3736.22 D1.1277 Dx-1.03872 Dy0.43906 +C i13 c39 x2179.41 y4616.91 X2180.09 Y4616.98 D0.819318 Dx-0.806933 Dy-0.141915 +C i14 c39 x2180.78 y4617.05 X2180.09 Y4616.98 D0.819318 Dx-0.806933 Dy-0.141915 +C i13 c40 x2734.19 y3790 X2733.17 Y3789.99 D1.79379 Dx1.79378 Dy0.00670471 +C i14 c40 x2732.15 y3789.99 X2733.17 Y3789.99 D1.79379 Dx1.79378 Dy0.00670471 +C i14 c41 x4154.38 y3800.15 X4153.76 Y3800.33 D1.1445 Dx1.08417 Dy-0.366685 +C i15 c41 x4153.14 y3800.52 X4153.76 Y3800.33 D1.1445 Dx1.08417 Dy-0.366685 +C i14 c42 x3846.93 y3075.03 X3846.59 Y3075.05 D0.67307 Dx0.671452 Dy-0.0466342 +C i15 c42 x3846.26 y3075.08 X3846.59 Y3075.05 D0.67307 Dx0.671452 Dy-0.0466342 +C i15 c43 x5301.95 y3087.52 X5301.57 Y3087.32 D0.851458 Dx0.751965 Dy0.399411 +C i0 c43 x5301.19 y3087.13 X5301.57 Y3087.32 D0.851458 Dx0.751965 Dy0.399411 +C i2 c44 x9716.18 y2401.46 X9716.39 Y2401.45 D0.394209 Dx-0.393901 Dy0.0155727 +C i3 c44 x9716.59 y2401.45 X9716.39 Y2401.45 D0.394209 Dx-0.393901 Dy0.0155727 +C i3 c45 x11306.3 y2456.37 X11306.8 Y2456.34 D1.05485 Dx-1.05242 Dy0.071649 +C i4 c45 x11307.4 y2456.3 X11306.8 Y2456.34 D1.05485 Dx-1.05242 Dy0.071649 +C i4 c46 x641.084 y2084.06 X640.707 Y2083.71 D0.990678 Dx0.686583 Dy0.714175 +C i5 c46 x640.329 y2083.35 X640.707 Y2083.71 D0.990678 Dx0.686583 Dy0.714175 +C i4 c47 x51.8179 y1407.63 X51.4559 Y1407.14 D1.094 Dx0.507847 Dy0.968983 +C i5 c47 x51.0939 y1406.66 X51.4559 Y1407.14 D1.094 Dx0.507847 Dy0.968983 +C i4 c48 x651.641 y2798.18 X652.02 Y2798.52 D1.01267 Dx-0.758377 Dy-0.671091 +C i5 c48 x652.4 y2798.85 X652.02 Y2798.52 D1.01267 Dx-0.758377 Dy-0.671091 +C i5 c49 x1690.96 y1756.71 X1689.68 Y1756.5 D2.16125 Dx2.11825 Dy0.428939 +C i6 c49 x1688.39 y1756.29 X1689.68 Y1756.5 D2.16125 Dx2.11825 Dy0.428939 +C i5 c50 x2463.17 y2198.63 X2463.83 Y2198.63 D1.23395 Dx-1.23392 Dy-0.00916689 +C i6 c50 x2464.49 y2198.64 X2463.83 Y2198.63 D1.23395 Dx-1.23392 Dy-0.00916689 +C i6 c51 x3547.55 y3381.77 X3547.46 Y3381.69 D0.244979 Dx0.181682 Dy0.164336 +C i7 c51 x3547.36 y3381.6 X3547.46 Y3381.69 D0.244979 Dx0.181682 Dy0.164336 +C i7 c52 x5299.85 y3085.6 X5301.11 Y3085.86 D2.56051 Dx-2.50506 Dy-0.529995 +C i0 c52 x5302.37 y3086.13 X5301.11 Y3085.86 D2.56051 Dx-2.50506 Dy-0.529995 +C i7 c53 x5282.25 y1809.96 X5282.23 Y1809.27 D1.37343 Dx0.0229698 Dy1.37324 +C i0 c53 x5282.22 y1808.59 X5282.23 Y1809.27 D1.37343 Dx0.0229698 Dy1.37324 +C i7 c54 x5014.62 y2077.86 X5014.35 Y2077.37 D1.09547 Dx0.492412 Dy0.978557 +C i0 c54 x5014.08 y2076.88 X5014.35 Y2077.37 D1.09547 Dx0.492412 Dy0.978557 +C i8 c55 x6769.93 y3416.86 X6770.37 Y3416.91 D0.855517 Dx-0.849473 Dy-0.101521 +C i1 c55 x6770.82 y3416.96 X6770.37 Y3416.91 D0.855517 Dx-0.849473 Dy-0.101521 +C i8 c56 x6523.71 y3133.85 X6523.61 Y3133.73 D0.301609 Dx0.18622 Dy0.237256 +C i1 c56 x6523.52 y3133.61 X6523.61 Y3133.73 D0.301609 Dx0.18622 Dy0.237256 +C i8 c57 x6603.4 y2438.88 X6602.77 Y2439.45 D1.69382 Dx1.24123 Dy-1.15255 +C i1 c57 x6602.13 y2440.03 X6602.77 Y2439.45 D1.69382 Dx1.24123 Dy-1.15255 +C i8 c58 x5013.77 y2606.56 X5013.77 Y2607.01 D0.910382 Dx-0.013913 Dy-0.910275 +C i0 c58 x5013.78 y2607.47 X5013.77 Y2607.01 D0.910382 Dx-0.013913 Dy-0.910275 +C i8 c59 x5287.17 y3085.26 X5287.63 Y3085.11 D0.961587 Dx-0.917026 Dy0.289333 +C i0 c59 x5288.09 y3084.97 X5287.63 Y3085.11 D0.961587 Dx-0.917026 Dy0.289333 +C i8 c60 x6522.76 y3133.9 X6523.03 Y3133.94 D0.556115 Dx-0.549764 Dy-0.0838031 +C i9 c60 x6523.31 y3133.99 X6523.03 Y3133.94 D0.556115 Dx-0.549764 Dy-0.0838031 +C i1 c61 x7944.33 y3063.92 X7944.15 Y3063.96 D0.355662 Dx0.345054 Dy-0.0862144 +C i9 c61 x7943.98 y3064.01 X7944.15 Y3063.96 D0.355662 Dx0.345054 Dy-0.0862144 +C i2 c62 x8033.12 y2971.11 X8033.15 Y2971.15 D0.107254 Dx-0.0605301 Dy-0.0885408 +C i9 c62 x8033.18 y2971.2 X8033.15 Y2971.15 D0.107254 Dx-0.0605301 Dy-0.0885408 +C i2 c63 x8018.13 y2352.04 X8018.55 Y2351.4 D1.51029 Dx-0.808988 Dy1.27535 +C i9 c63 x8018.97 y2350.76 X8018.55 Y2351.4 D1.51029 Dx-0.808988 Dy1.27535 +C i1 c64 x6603.45 y2442.59 X6603.1 Y2442.45 D0.736441 Dx0.680358 Dy0.281884 +C i9 c64 x6602.75 y2442.31 X6603.1 Y2442.45 D0.736441 Dx0.680358 Dy0.281884 +C i1 c65 x6811.31 y2420.56 X6811.68 Y2420.7 D0.780219 Dx-0.727118 Dy-0.282916 +C i9 c65 x6812.06 y2420.84 X6811.68 Y2420.7 D0.780219 Dx-0.727118 Dy-0.282916 +C i2 c66 x8017.92 y2351.03 X8018.3 Y2351.36 D0.980105 Dx-0.733 Dy-0.650628 +C i10 c66 x8018.68 y2351.68 X8018.3 Y2351.36 D0.980105 Dx-0.733 Dy-0.650628 +C i2 c67 x8196.07 y3270.12 X8196.04 Y3270.11 D0.0700322 Dx0.0674607 Dy0.0188032 +C i10 c67 x8196 y3270.1 X8196.04 Y3270.11 D0.0700322 Dx0.0674607 Dy0.0188032 +C i3 c68 x9749.58 y3349.51 X9749.14 Y3349.54 D0.849046 Dx0.847387 Dy-0.0530645 +C i10 c68 x9748.71 y3349.56 X9749.14 Y3349.54 D0.849046 Dx0.847387 Dy-0.0530645 +C i3 c69 x9617.37 y2743.01 X9617.83 Y2742.55 D1.29822 Dx-0.92236 Dy0.913578 +C i10 c69 x9618.3 y2742.1 X9617.83 Y2742.55 D1.29822 Dx-0.92236 Dy0.913578 +C i9 c70 x8499.75 y4918.99 X8499.32 Y4919.42 D0.948449 Dx0.385292 Dy-0.866664 +C i10 c70 x8498.9 y4919.85 X8499.32 Y4919.42 D0.948449 Dx0.385292 Dy-0.866664 +C i9 c71 x8115.65 y5158.68 X8116.33 Y5158.18 D1.09454 Dx-0.454191 Dy0.995853 +C i10 c71 x8117.02 y5157.69 X8116.33 Y5158.18 D1.09454 Dx-0.454191 Dy0.995853 +C i8 c72 x6749.96 y5065.3 X6748.34 Y5065.21 D1.24307 Dx1.23068 Dy0.175099 +C i9 c72 x6746.72 y5065.12 X6748.34 Y5065.21 D1.24307 Dx1.23068 Dy0.175099 +C i8 c73 x5722.41 y4989.32 X5722.96 Y4988.78 D1.17302 Dx-0.459201 Dy1.0794 +C i9 c73 x5723.51 y4988.25 X5722.96 Y4988.78 D1.17302 Dx-0.459201 Dy1.0794 +C i9 c74 x7785.89 y4160.46 X7785.82 Y4160.34 D0.268502 Dx0.109691 Dy0.245074 +C i10 c74 x7785.75 y4160.22 X7785.82 Y4160.34 D0.268502 Dx0.109691 Dy0.245074 +C i11 c75 x10875.4 y3831.4 X10875.4 Y3831.54 D0.28685 Dx-0.0254545 Dy-0.285719 +C i12 c75 x10875.4 y3831.68 X10875.4 Y3831.54 D0.28685 Dx-0.0254545 Dy-0.285719 +C i11 c76 x9969.13 y4779.23 X9969.38 Y4779.01 D0.51104 Dx-0.258863 Dy0.440626 +C i12 c76 x9969.63 y4778.79 X9969.38 Y4779.01 D0.51104 Dx-0.258863 Dy0.440626 +C i11 c77 x146.746 y4717.14 X146.59 Y4717.34 D0.42335 Dx0.169856 Dy-0.387781 +C i12 c77 x146.435 y4717.53 X146.59 Y4717.34 D0.42335 Dx0.169856 Dy-0.387781 +C i12 c78 x836.487 y3895.74 X836.806 Y3895.44 D0.803887 Dx-0.543215 Dy0.59258 +C i13 c78 x837.125 y3895.15 X836.806 Y3895.44 D0.803887 Dx-0.543215 Dy0.59258 +C i12 c79 x980.171 y2564.57 X980.604 Y2565.55 D2.13133 Dx-0.854312 Dy-1.95262 +C i13 c79 x981.037 y2566.52 X980.604 Y2565.55 D2.13133 Dx-0.854312 Dy-1.95262 +C i13 c80 x1697.64 y3918.19 X1697.12 Y3918.48 D1.0607 Dx0.891327 Dy-0.57499 +C i14 c80 x1696.59 y3918.77 X1697.12 Y3918.48 D1.0607 Dx0.891327 Dy-0.57499 +C i13 c81 x1627.76 y5015.13 X1628.22 Y5014.54 D1.23129 Dx-0.375873 Dy1.17252 +C i14 c81 x1628.68 y5013.96 X1628.22 Y5014.54 D1.23129 Dx-0.375873 Dy1.17252 +C i6 c82 x3163.48 y3201.59 X3163.2 Y3201.08 D1.1598 Dx0.551331 Dy1.02038 +C i14 c82 x3162.92 y3200.57 X3163.2 Y3201.08 D1.1598 Dx0.551331 Dy1.02038 +C i6 c83 x3847.32 y3072.9 X3846.94 Y3072.65 D0.904865 Dx0.757562 Dy0.494854 +C i14 c83 x3846.55 y3072.41 X3846.94 Y3072.65 D0.904865 Dx0.757562 Dy0.494854 +C i6 c84 x2103.44 y2882.35 X2104.13 Y2881.53 D2.14069 Dx-1.37258 Dy1.64273 +C i14 c84 x2104.81 y2880.71 X2104.13 Y2881.53 D2.14069 Dx-1.37258 Dy1.64273 +C i5 c85 x2099.72 y2780.42 X2100.19 Y2780.21 D1.02398 Dx-0.932493 Dy0.423066 +C i14 c85 x2100.66 y2780 X2100.19 Y2780.21 D1.02398 Dx-0.932493 Dy0.423066 +C i5 c86 x2463.6 y2879.93 X2463.99 Y2880.02 D0.810542 Dx-0.790775 Dy-0.177912 +C i14 c86 x2464.39 y2880.11 X2463.99 Y2880.02 D0.810542 Dx-0.790775 Dy-0.177912 +C i5 c87 x2612.8 y2472.96 X2613.22 Y2473.34 D1.10691 Dx-0.805405 Dy-0.75933 +C i14 c87 x2613.63 y2473.72 X2613.22 Y2473.34 D1.10691 Dx-0.805405 Dy-0.75933 +C i6 c88 x2547.54 y2495.24 X2547.12 Y2496.15 D2.00479 Dx0.821811 Dy-1.82861 +C i14 c88 x2546.7 y2497.07 X2547.12 Y2496.15 D2.00479 Dx0.821811 Dy-1.82861 +C i7 c89 x3849.98 y3072.75 X3849.35 Y3072.72 D1.24337 Dx1.2415 Dy0.0681396 +C i14 c89 x3848.73 y3072.69 X3849.35 Y3072.72 D1.24337 Dx1.2415 Dy0.0681396 +C i7 c90 x3626.6 y3247.51 X3625.99 Y3247.42 D1.20027 Dx1.18555 Dy0.187421 +C i14 c90 x3625.39 y3247.32 X3625.99 Y3247.42 D1.20027 Dx1.18555 Dy0.187421 +C i5 c91 x652.41 y2800.5 X652.48 Y2800.15 D0.721474 Dx-0.14086 Dy0.70759 +C i12 c91 x652.551 y2799.79 X652.48 Y2800.15 D0.721474 Dx-0.14086 Dy0.70759 +C i4 c92 x11382 y2808.52 X11382.1 Y2808.75 D0.486017 Dx-0.166516 Dy-0.456601 +C i12 c92 x11382.2 y2808.98 X11382.1 Y2808.75 D0.486017 Dx-0.166516 Dy-0.456601 +C i4 c93 x11171.9 y3363.42 X11171.7 Y3363.18 D0.667079 Dx0.457568 Dy0.485412 +C i12 c93 x11171.4 y3362.94 X11171.7 Y3363.18 D0.667079 Dx0.457568 Dy0.485412 +C i4 c94 x14.4815 y3305.04 X14.34 Y3305.33 D0.636103 Dx0.275555 Dy-0.573321 +C i12 c94 x14.1985 y3305.62 X14.34 Y3305.33 D0.636103 Dx0.275555 Dy-0.573321 +C i3 c95 x10998.6 y2996.69 X10998.8 Y2997.01 D0.699961 Dx-0.272156 Dy-0.644885 +C i12 c95 x10998.9 y2997.34 X10998.8 Y2997.01 D0.699961 Dx-0.272156 Dy-0.644885 +C i3 c96 x10997.4 y3330.73 X10997.3 Y3330.69 D0.272224 Dx0.262725 Dy0.0712851 +C i12 c96 x10997.2 y3330.65 X10997.3 Y3330.69 D0.272224 Dx0.262725 Dy0.0712851 +C i13 c97 x1554.77 y5014.04 X1554.97 Y5014.76 D1.43621 Dx-0.167254 Dy-1.42643 +C i12 c97 x1555.18 y5015.47 X1554.97 Y5014.76 D1.43621 Dx-0.167254 Dy-1.42643 +C i11 c98 x10372.4 y5006.68 X10373.5 Y5006.08 D1.50934 Dx-0.929057 Dy1.18952 +C i12 c98 x10374.6 y5005.49 X10373.5 Y5006.08 D1.50934 Dx-0.929057 Dy1.18952 +C i14 c99 x4503.8 y5039.83 X4502.62 Y5039.41 D1.25391 Dx0.932932 Dy0.83781 +C i8 c99 x4501.43 y5038.99 X4502.62 Y5039.41 D1.25391 Dx0.932932 Dy0.83781 +C i14 c100 x2615.21 y3331.57 X2615.04 Y3331.03 D1.13426 Dx0.331271 Dy1.0848 +C i6 c100 x2614.87 y3330.48 X2615.04 Y3331.03 D1.13426 Dx0.331271 Dy1.0848 +C i14 c101 x2906.59 y2910.24 X2907.05 Y2910.36 D0.946658 Dx-0.914581 Dy-0.244344 +C i6 c101 x2907.51 y2910.48 X2907.05 Y2910.36 D0.946658 Dx-0.914581 Dy-0.244344 +C i15 c102 x3984.36 y2909.85 X3984.78 Y2909.99 D0.886187 Dx-0.841751 Dy-0.277097 +C i6 c102 x3985.2 y2910.13 X3984.78 Y2909.99 D0.886187 Dx-0.841751 Dy-0.277097 +C i15 c103 x3540.65 y3119.96 X3540.57 Y3119.85 D0.264395 Dx0.154294 Dy0.214705 +C i6 c103 x3540.5 y3119.74 X3540.57 Y3119.85 D0.264395 Dx0.154294 Dy0.214705 +C i6 c104 x3987.84 y2564.09 X3987.58 Y2563.92 D0.625327 Dx0.523954 Dy0.341328 +C i15 c104 x3987.31 y2563.75 X3987.58 Y2563.92 D0.625327 Dx0.523954 Dy0.341328 +C i5 c105 x1728.65 y2826.71 X1728.22 Y2826.44 D1.01721 Dx0.868654 Dy0.529293 +C i13 c105 x1727.78 y2826.18 X1728.22 Y2826.44 D1.01721 Dx0.868654 Dy0.529293 +C i5 c106 x2100.53 y2781.31 X2100.48 Y2781.31 D0.0964769 Dx0.0961344 Dy0.00812236 +C i13 c106 x2100.43 y2781.31 X2100.48 Y2781.31 D0.0964769 Dx0.0961344 Dy0.00812236 +C i5 c107 x653.255 y2800.46 X652.856 Y2800.32 D0.843472 Dx0.797409 Dy0.274928 +C i13 c107 x652.457 y2800.18 X652.856 Y2800.32 D0.843472 Dx0.797409 Dy0.274928 +C i15 c108 x5689.26 y3844.63 X5688.63 Y3844.38 D1.18494 Dx1.08062 Dy0.486155 +C i8 c108 x5688.01 y3844.14 X5688.63 Y3844.38 D1.18494 Dx1.08062 Dy0.486155 +C i15 c109 x5242.34 y3598.27 X5242.03 Y3597.97 D0.826906 Dx0.57106 Dy0.59805 +C i8 c109 x5241.72 y3597.68 X5242.03 Y3597.97 D0.826906 Dx0.57106 Dy0.59805 +C i15 c110 x4674.54 y3505.28 X4674.57 Y3505.71 D0.862638 Dx-0.0524066 Dy-0.861045 +C i8 c110 x4674.6 y3506.14 X4674.57 Y3505.71 D0.862638 Dx-0.0524066 Dy-0.861045 +C i15 c111 x5825.26 y4383.98 X5825.02 Y4384.32 D0.755549 Dx0.33525 Dy-0.677098 +C i9 c111 x5824.77 y4384.66 X5825.02 Y4384.32 D0.755549 Dx0.33525 Dy-0.677098 +C i15 c113 x4861.22 y2577.18 X4861.25 Y2577.95 D1.53566 Dx-0.0585547 Dy-1.53454 +C i0 c113 x4861.28 y2578.72 X4861.25 Y2577.95 D1.53566 Dx-0.0585547 Dy-1.53454 +C i15 c114 x5053.14 y2512.26 X5052.68 Y2511.78 D1.31607 Dx0.890125 Dy0.96939 +C i0 c114 x5052.23 y2511.29 X5052.68 Y2511.78 D1.31607 Dx0.890125 Dy0.96939 Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/optimizer_everything_wo_trans.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/optimizer_everything_wo_trans.txt (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PToptimizer/reference/optimizer_everything_wo_trans.txt 2010-07-13 01:27:06 UTC (rev 1285) @@ -0,0 +1,743 @@ +# Created by Panotools::Script 0.25 + +p f2 h5755 n"TIFF_m c:NONE" v360 w11640 +m f0 g1 i0 m2 p0.00784314 + +# Image lines +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6556.jpg" p29.5854653922993 r-1.25828188551223 t0 v72.2213 w2336 y0 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6557.jpg" p29.5913706578841 r-0.992326704086645 t0 v72.2213 w2336 y45.5072541329743 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6558.jpg" p29.4014565195123 r-0.774176840542781 t0 v72.2213 w2336 y90.3167925087562 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6559.jpg" p29.1367078566066 r-0.868013771261336 t0 v72.2213 w2336 y135.711689689941 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6560.jpg" p150.973039189246 r178.917940467963 t0 v72.2213 w2336 y0.918212020490364 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6561.jpg" p29.1481002984711 r-1.27292397946249 t0 v72.2213 w2336 y-134.183331339811 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6562.jpg" p29.3070389126475 r-1.34767158643817 t0 v72.2213 w2336 y-89.1548757295396 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6563.jpg" p29.4120521079244 r-1.3736909523997 t0 v72.2213 w2336 y-44.3327611689326 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6564.jpg" p-29.8288972815969 r0.333288092599086 t0 v72.2213 w2336 y0.781911240965593 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6565.jpg" p-29.8408853550192 r0.542509597785516 t0 v72.2213 w2336 y45.5793373867024 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6566.jpg" p-30.0136717198283 r0.723520003300046 t0 v72.2213 w2336 y90.4176380574451 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6567.jpg" p-30.2578224313702 r0.662053082191327 t0 v72.2213 w2336 y135.772969167834 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6568.jpg" p-30.3660104181049 r0.487774538257366 t0 v72.2213 w2336 y-178.713941888217 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6569.jpg" p-30.2774662253677 r0.231699460723244 t0 v72.2213 w2336 y-133.620194210743 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6570.jpg" p-30.0927436500294 r0.153595951940199 t0 v72.2213 w2336 y-87.4938004959903 +i TrX0 TrY0 TrZ0 a0.002796 b-0.014182 c0.002121 d-7.95008 e29.73 f0 g0 h3504 n"./060720_6571.jpg" p-29.9525123413865 r0.177318850587939 t0 v72.2213 w2336 y-43.5943548553294 + +# Variable lines +v a0 b0 c0 d0 e0 p0 r0 v0 +v p1 r1 y1 +v p2 r2 y2 +v p3 r3 y3 +v p4 r4 y4 +v p5 r5 y5 +v p6 r6 y6 +v p7 r7 y7 +v p8 r8 y8 +v p9 r9 y9 +v p10 r10 y10 +v p11 r11 y11 +v p12 r12 y12 +v p13 r13 y13 +v p14 r14 y14 +v + +# Control point lines +c N1 X549.963 Y2078.63 n0 t0 x1850 y2093 +c N1 X256.685 Y3019.8 n0 t0 x1931 y3047 +c N1 X1066.32 Y1551.03 n0 t0 x2190 y1344 +c N2 X1034.5 Y1799.12 n1 t0 x2256 y1639 +c N2 X703.977 Y2460.36 n1 t0 x2156 y2461 +c N2 X131.398 Y2500.93 n1 t0 x1610 y2550 +c N3 X105.82 Y2555.27 n2 t0 x1632 y2601 +c N3 X223 Y2736.5 n2 t0 x1796.5 y2767.5 +c N3 X637.817 Y1423.97 n2 t0 x1674 y1452 +c N4 X191 Y1166.5 n3 t0 x1249 y1434 +c N4 X899.732 Y1721.38 n3 t0 x2067 y1613 +c N4 X322.196 Y3296.01 n3 t0 x2107 y3350 +c N5 X266.114 Y2980.97 n4 t0 x1909 y3005 +c N5 X695.377 Y1523.09 n4 t0 x1755 y1514 +c N5 X323 Y3429.96 n4 t1 x1771 y1591 +c N6 X1032.25 Y1587.2 n5 t0 x2155 y1405 +c N6 X253.763 Y2662.99 n5 t0 x1784 y2694 +c N7 X547.362 Y2918.38 n6 t0 x2180 y2971 +c N7 X763.061 Y1727.18 n6 t0 x1902 y1684 +c N7 X198.204 Y1657.89 n6 t0 x1391 y1819 +c N8 X180.928 Y494.174 n7 t0 x1744 ... [truncated message content] |
From: <tom...@us...> - 2010-07-16 01:14:12
|
Revision: 1286 http://panotools.svn.sourceforge.net/panotools/?rev=1286&view=rev Author: tomaszmeger Date: 2010-07-16 01:14:04 +0000 (Fri, 16 Jul 2010) Log Message: ----------- Added reference file for PTroller, PTcrop, PTuncrop and PTtiff2psd. Modified Paths: -------------- branches/libpano_gsoc2010_regtests/tests/gsoc/f0/CMakeLists.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f1/CMakeLists.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f2/CMakeLists.txt branches/libpano_gsoc2010_regtests/tests/gsoc/f3/CMakeLists.txt branches/libpano_gsoc2010_regtests/tests/gsoc/gen.pl branches/libpano_gsoc2010_regtests/tests/gsoc/optTests.pl Added Paths: ----------- branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0000.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0001.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0002.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0003.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0004.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0005.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0006.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0007.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0008.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0009.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0010.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0011.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0012.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0013.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0014.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0015.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTroller/ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTroller/reference/ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTroller/reference/PTroller_result.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTtiff2psd/ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTtiff2psd/reference/ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTtiff2psd/reference/PTtiff2psd_result branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTtiff2psd/test/ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTtiff2psd/test/PTtiff2psd_result branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0000.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0001.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0002.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0003.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0004.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0005.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0006.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0007.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0008.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0009.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0010.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0011.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0012.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0013.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0014.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0015.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTcrop/ branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTcrop/reference/ branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTcrop/reference/PTcrop_result0000.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTcrop/reference/PTcrop_result0001.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTcrop/reference/PTcrop_result0002.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTcrop/reference/PTcrop_result0003.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTroller/ branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTroller/reference/ branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTroller/reference/PTroller_result.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTtiff2psd/ branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTtiff2psd/reference/ branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTtiff2psd/reference/PTtiff2psd_result branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTuncrop/ branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTuncrop/test/ branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/ branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/ branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0000.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0001.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0002.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0003.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0004.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0005.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0006.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0007.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTroller/ branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTroller/reference/ branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTroller/reference/PTroller_result.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTtiff2psd/ branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTtiff2psd/reference/ branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTtiff2psd/reference/PTtiff2psd_result branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/ branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/ branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0000.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0001.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0002.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0003.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0004.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0005.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0006.tif branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0007.tif Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/CMakeLists.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f0/CMakeLists.txt 2010-07-13 01:27:06 UTC (rev 1285) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f0/CMakeLists.txt 2010-07-16 01:14:04 UTC (rev 1286) @@ -25,3 +25,7 @@ #set_test(parser_f0_projections_and_formats "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "pf ${CMAKE_CURRENT_SOURCE_DIR}/test.txt") set_test(PToptimizer_f0 "${TOP_SRC_DIR}/tests/gsoc/optTests.pl" "" "${CMAKE_CURRENT_SOURCE_DIR}/optimizer.txt") +set_test(PTroller_f0 "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-o" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +set_test(PTcrop_f0 "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-C" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +set_test(PTuncrop_f0 "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-U" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +set_test(PTtiff2psd_f0 "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-T" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0000.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0000.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0001.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0001.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0002.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0002.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0003.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0003.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0004.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0004.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0005.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0005.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0006.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0006.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0007.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0007.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0008.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0008.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0009.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0009.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0010.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0010.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0011.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0011.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0012.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0012.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0013.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0013.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0014.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0014.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0015.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTcrop/reference/PTcrop_result0015.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTroller/reference/PTroller_result.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTroller/reference/PTroller_result.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTtiff2psd/reference/PTtiff2psd_result =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTtiff2psd/reference/PTtiff2psd_result ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTtiff2psd/test/PTtiff2psd_result =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTtiff2psd/test/PTtiff2psd_result ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0000.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0000.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0001.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0001.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0002.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0002.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0003.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0003.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0004.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0004.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0005.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0005.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0006.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0006.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0007.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0007.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0008.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0008.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0009.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0009.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0010.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0010.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0011.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0011.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0012.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0012.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0013.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0013.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0014.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0014.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0015.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f0/tests/PTuncrop/reference/PTuncrop_result0015.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/f1/CMakeLists.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f1/CMakeLists.txt 2010-07-13 01:27:06 UTC (rev 1285) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f1/CMakeLists.txt 2010-07-16 01:14:04 UTC (rev 1286) @@ -25,3 +25,4 @@ #set_test(parser_f1_a_b_c "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "ABC" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") #set_test(parser_f1_d_e "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "DE" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") #set_test(parser_f1_g_t "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "GT" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") + Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/CMakeLists.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f2/CMakeLists.txt 2010-07-13 01:27:06 UTC (rev 1285) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f2/CMakeLists.txt 2010-07-16 01:14:04 UTC (rev 1286) @@ -24,5 +24,9 @@ #set_test(parser_f2_d_e "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "DE" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") #set_test(parser_f2_g_t "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "GT" -set_test(PToptimizer_f0 "${TOP_SRC_DIR}/tests/gsoc/optTests.pl" "" "${CMAKE_CURRENT_SOURCE_DIR}/optimizer.txt") +set_test(PToptimizer_f2 "${TOP_SRC_DIR}/tests/gsoc/optTests.pl" "" "${CMAKE_CURRENT_SOURCE_DIR}/optimizer.txt") +set_test(PTroller_f2 "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-o" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +set_test(PTcrop_f2 "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-C" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +set_test(PTuncrop_f2 "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-U" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +set_test(PTtiff2psd_f2 "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-T" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTcrop/reference/PTcrop_result0000.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTcrop/reference/PTcrop_result0000.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTcrop/reference/PTcrop_result0001.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTcrop/reference/PTcrop_result0001.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTcrop/reference/PTcrop_result0002.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTcrop/reference/PTcrop_result0002.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTcrop/reference/PTcrop_result0003.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTcrop/reference/PTcrop_result0003.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTroller/reference/PTroller_result.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTroller/reference/PTroller_result.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTtiff2psd/reference/PTtiff2psd_result =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f2/tests/PTtiff2psd/reference/PTtiff2psd_result ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/CMakeLists.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/f3/CMakeLists.txt 2010-07-13 01:27:06 UTC (rev 1285) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/f3/CMakeLists.txt 2010-07-16 01:14:04 UTC (rev 1286) @@ -24,5 +24,8 @@ #set_test(parser_f3_d_e "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "DE" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") #set_test(parser_f3_g_t "${TOP_SRC_DIR}/tests/gsoc/parser.pl" "GT" -set_test(PToptimizer_f0 "${TOP_SRC_DIR}/tests/gsoc/optTests.pl" "" "${CMAKE_CURRENT_SOURCE_DIR}/optimizer.txt") - +set_test(PToptimizer_f3 "${TOP_SRC_DIR}/tests/gsoc/optTests.pl" "" "${CMAKE_CURRENT_SOURCE_DIR}/optimizer.txt") +set_test(PTroller_f3 "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-o" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +set_test(PTcrop_f3 "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-C" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +set_test(PTuncrop_f3 "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-U" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") +set_test(PTtiff2psd_f3 "${TOP_SRC_DIR}/tests/gsoc/gen.pl" "-T" "${CMAKE_CURRENT_SOURCE_DIR}/test.txt") Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0000.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0000.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0001.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0001.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0002.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0002.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0003.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0003.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0004.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0004.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0005.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0005.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0006.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0006.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0007.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTcrop/reference/PTcrop_result0007.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTroller/reference/PTroller_result.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTroller/reference/PTroller_result.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTtiff2psd/reference/PTtiff2psd_result =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTtiff2psd/reference/PTtiff2psd_result ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0000.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0000.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0001.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0001.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0002.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0002.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0003.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0003.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0004.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0004.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0005.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0005.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0006.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0006.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0007.tif =================================================================== (Binary files differ) Property changes on: branches/libpano_gsoc2010_regtests/tests/gsoc/f3/tests/PTuncrop/reference/PTuncrop_result0007.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/gen.pl =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/gen.pl 2010-07-13 01:27:06 UTC (rev 1285) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/gen.pl 2010-07-16 01:14:04 UTC (rev 1286) @@ -523,6 +523,7 @@ my @location = split( '/', $image->{n} ); $image->{n} = ( '"' . $pwd . '/' . $location[-1] ); } + #PTroller testing if($testPTroller ) { unless ( -d "tests/PTroller" ) { mkdir( "tests/PTroller", 0755 ) || print $!; @@ -533,6 +534,7 @@ runTest("tmp.txt"); toolsTest("tmp.txt", "PTroller","o"); } + #PTcrop testing if($testPTcrop ) { unless ( -d "tests/PTcrop" ) { mkdir( "tests/PTcrop", 0755 ) || print $!; @@ -543,6 +545,7 @@ runTest("tmp.txt"); toolsTest("tmp.txt", "PTcrop","p"); } + #PTuncrop testing if($testPTuncrop ) { unless ( -d "tests/PTuncrop" ) { mkdir( "tests/PTuncrop", 0755 ) || print $!; @@ -553,6 +556,7 @@ runTest("tmp.txt"); toolsTest("tmp.txt", "PTuncrop","p"); } + #PTtiff2psd testing if($testPTtiff2psd ) { unless ( -d "tests/PTtiff2psd" ) { mkdir( "tests/PTtiff2psd", 0755 ) || print $!; @@ -562,7 +566,8 @@ PTmenderAdapt("tmp.txt"); runTest("tmp.txt"); toolsTest("tmp.txt", "PTtiff2psd","o"); - } + } + #simple testing if($testSimple) { unless ( -d "tests/simple" ) { mkdir( "tests/simple", 0755 ) || print $!; @@ -582,6 +587,7 @@ } } +#for PTroller, PTcrop, PTuncrop and PTtiff2psd sub toolsTest { my ($tmp, $tool, $arg) = @_; my $pwd = `pwd`; @@ -620,6 +626,7 @@ } } +#comparing psd files sub psdCmp { my ($t) = @_; my @r = split( '/', $t ); @@ -636,7 +643,10 @@ print $diff_output; print "diff length:".length($diff_output)."\n"; `rm -f test.out`; - `rm -f reference.out`; + `rm -f reference.out`; + if (length($diff_output) > 2) { + $failedTestsNo++; + } } sub identifyOutputAdjust { Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/optTests.pl =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/optTests.pl 2010-07-13 01:27:06 UTC (rev 1285) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/optTests.pl 2010-07-16 01:14:04 UTC (rev 1286) @@ -311,10 +311,14 @@ optTests.pl [options] <script_file> Options: + -a | --anchor Sets anchor photo number + -r | --reference Create reference (comparing is omited) + -o | --output Sets output name + -h | --help Outputs help =head1 DESCRIPTION +B<optTests.pl> - tests the main - =head1 LICENSE This program is free software; you can redistribute it and/or This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tom...@us...> - 2010-08-09 03:57:13
|
Revision: 1290 http://panotools.svn.sourceforge.net/panotools/?rev=1290&view=rev Author: tomaszmeger Date: 2010-08-09 03:57:06 +0000 (Mon, 09 Aug 2010) Log Message: ----------- Added first edition of function level testing programs. Tests are already integrated with cmake. Right now only optimization related functions are available. Modified Paths: -------------- branches/libpano_gsoc2010_regtests/tests/gsoc/CMakeLists.txt Added Paths: ----------- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/CMakeLists.txt branches/libpano_gsoc2010_regtests/tests/gsoc/functions/CheckParamsTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/RunLMOptimizerTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/distSquaredTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_albersequalareaconicTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/optimizer.txt Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/CMakeLists.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/CMakeLists.txt 2010-07-24 21:25:16 UTC (rev 1289) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/CMakeLists.txt 2010-08-09 03:57:06 UTC (rev 1290) @@ -55,3 +55,5 @@ add_subdirectory(f3) endif() +add_subdirectory(functions) + Added: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/CMakeLists.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/CMakeLists.txt (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/CMakeLists.txt 2010-08-09 03:57:06 UTC (rev 1290) @@ -0,0 +1,59 @@ +# This file is part of libpano13, the hugin build environment. +# Licence details can be found in the file gpl.txt. +# +# Copyright (c) 2009 Kornel Benko, <Kor...@be...> +# Modified by Tomasz Meger +# + +project(function_tests) + + +set(commands + erect_albersequalareaconicTest + CheckParamsTest + distSquaredTest + RunLMOptimizerTest + ) + + +# panoinfo needs windows.h + +if(WIN32) + list(APPEND commands panoinfo) +endif() + +include_directories(${TOP_SRC_DIR}) + +foreach(_cmd ${commands}) + add_executable(${_cmd} ${_cmd}.c) + target_link_libraries(${_cmd} ${_pano_target} ${_common_libs}) + install(TARGETS ${_cmd} DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel) +endforeach(_cmd) + +file(GLOB input RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*.txt") +set(_depends) +foreach(_i ${input}) + if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${_i}") + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_i}" + COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/${_i}" "${CMAKE_CURRENT_BINARY_DIR}/${_i}" + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${_i}") + SET_SOURCE_FILES_PROPERTIES("${CMAKE_CURRENT_BINARY_DIR}/${_i}" GENERATED) + list(APPEND _depends "${CMAKE_CURRENT_BINARY_DIR}/${_i}") + endif() +endforeach(_i) +add_custom_target(function_tests ALL DEPENDS ${_depends}) + + +macro(set_test_f _TestIdentifier _ExecutableName) + ADD_TEST(${_TestIdentifier} ${_ExecutableName}) + SET_TESTS_PROPERTIES(${_TestIdentifier} PROPERTIES TIMEOUT "600") + SET_TESTS_PROPERTIES(${_TestIdentifier} PROPERTIES FAIL_REGULAR_EXPRESSION "Number of tests that failed: [1-9][0-9]*") + SET_TESTS_PROPERTIES(${_TestIdentifier} PROPERTIES PASS_REGULAR_EXPRESSION "Number of tests that failed: 0") +endmacro() + + +set_test_f(function_CheckParams "${CMAKE_CURRENT_BINARY_DIR}/CheckParamsTest") +set_test_f(function_distSquared "${CMAKE_CURRENT_BINARY_DIR}/distSquaredTest") +set_test_f(function_RunLMOptimizer "${CMAKE_CURRENT_BINARY_DIR}/RunLMOptimizerTest") + Added: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/CheckParamsTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/CheckParamsTest.c (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/CheckParamsTest.c 2010-08-09 03:57:06 UTC (rev 1290) @@ -0,0 +1,266 @@ +/* + * CheckParamsTest.c + * + * Tests CheckParams function. + * + * July 2010 + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Tomasz Meger + * + */ + +#include "filter.h" +#include "dump.h" +#include <stdio.h> + +int test1 (AlignInfo ainf); +int test2 (AlignInfo ainf); +int test3 (AlignInfo ainf); +int test4 (AlignInfo ainf); +int test5 (AlignInfo ainf); +int test6 (AlignInfo ainf); +int test7 (AlignInfo ainf); +int test8 (AlignInfo ainf); +int test9 (AlignInfo ainf); +int test10 (AlignInfo ainf); + +int main(int argc, char *argv[]) +{ + AlignInfo ainf; + char* script; + fullPath infile; + int testsFailed = 0; + int result; + + StringtoFullPath( &infile, "optimizer.txt" ); + script = LoadScript( &infile ); + ParseScript( script, &ainf ); + + result += test1(ainf); + result += test2(ainf); + result += test3(ainf); + result += test4(ainf); + result += test5(ainf); + result += test6(ainf); + result += test7(ainf); + result += test8(ainf); + result += test9(ainf); + result += test10(ainf); + + printf("Number of tests that failed: %d\n", testsFailed); + return 0; +} + + +int test1 (AlignInfo ainf) +{ + printf("Test1 \n"); + if (CheckParams( &ainf ) == 0) + { + printf("OK\n"); + return 0; + } + else + { + printf("NOT OK\n"); + return 1; + } +} + +int test2 (AlignInfo ainf) +{ + int tmp = ainf.im[3].cP.tilt_scale; + ainf.im[3].cP.tilt_scale = 0; + printf("Test2 \n"); + if (CheckParams( &ainf ) == -1) + { + printf("OK\n"); + ainf.im[3].cP.tilt_scale = tmp; + return 0; + } + else + { + printf("NOT OK\n"); + ainf.im[3].cP.tilt_scale = tmp; + return 1; + } +} + +int test3 (AlignInfo ainf) +{ + int tmp = ainf.numParam; + int result; + ainf.numParam = 0; + printf("Test3 \n"); + result = CheckParams( &ainf ); + ainf.numParam = tmp; + if (result == -1) + { + printf("OK\n"); + return 0; + } + else + { + printf("NOT OK\n"); + return 1; + } +} + +int test4 (AlignInfo ainf) +{ + int tmp = ainf.numIm; + int result; + ainf.numIm = 0; + printf("Test4 \n"); + result = CheckParams( &ainf ); + ainf.numIm = tmp; + if (result == -1) + { + printf("OK\n"); + return 0; + } + else + { + printf("NOT OK\n"); + return 1; + } +} + +int test5 (AlignInfo ainf) +{ + int tmp = ainf.numPts; + int result; + ainf.numPts = 0; + printf("Test5 \n"); + result = CheckParams( &ainf ); + ainf.numPts = tmp; + if (result == -1) + { + printf("OK\n"); + return 0; + } + else + { + printf("NOT OK\n"); + return 1; + } +} + +int test6 (AlignInfo ainf) +{ + int tmp = ainf.im[0].width; + int result; + ainf.im[0].width = 0; + printf("Test6 \n"); + result = CheckParams( &ainf ); + ainf.im[0].width = tmp; + if (result == -1) + { + printf("OK\n"); + return 0; + } + else + { + printf("NOT OK\n"); + return 1; + } +} + +int test7 (AlignInfo ainf) +{ + int tmp = ainf.im[1].height; + int result; + ainf.im[1].height = -500; + printf("Test7 \n"); + result = CheckParams( &ainf ); + ainf.im[1].height = tmp; + if (result == -1) + { + printf("OK\n"); + return 0; + } + else + { + printf("NOT OK\n"); + return 1; + } +} + +int test8 (AlignInfo ainf) +{ + double tmp = ainf.im[2].hfov; + int result; + ainf.im[2].hfov = -10.0; + printf("Test8 \n"); + result = CheckParams( &ainf ); + ainf.im[2].hfov = tmp; + if (result == -1) + { + printf("OK\n"); + return 0; + } + else + { + printf("NOT OK\n"); + return 1; + } +} + +int test9 (AlignInfo ainf) +{ + double tmp = ainf.im[2].hfov; + int tmp2 = ainf.im[2].format; + int result; + ainf.im[2].hfov = 180.1; + ainf.im[2].format = _rectilinear; + printf("Test9 \n"); + result = CheckParams( &ainf ); + ainf.im[2].hfov = tmp; + ainf.im[2].format = tmp2; + if (result == -1) + { + printf("OK\n"); + return 0; + } + else + { + printf("NOT OK\n"); + return 1; + } +} + +int test10 (AlignInfo ainf) +{ + int tmp = ainf.im[2].format; + int result; + ainf.im[2].format = _rectilinear; + printf("Test10 \n"); + result = CheckParams( &ainf ); + ainf.im[2].format = tmp; + if (result == 0) + { + printf("OK\n"); + return 0; + } + else + { + printf("NOT OK\n"); + return 1; + } +} + + Added: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/RunLMOptimizerTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/RunLMOptimizerTest.c (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/RunLMOptimizerTest.c 2010-08-09 03:57:06 UTC (rev 1290) @@ -0,0 +1,949 @@ +/* + * RunLMOptimizerTest.c + * + * Tests RunLMOptimizer function. + * + * July 2010 + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Tomasz Meger + * + */ + +#include "filter.h" +#include <stdio.h> + +static AlignInfo *optInfo; + +int test(char * filename); +int compare(AlignInfo ainf); + +int main(int argc, char *argv[]) +{ + int testsFailed = 0; + + testsFailed += test("optimizer.txt"); + + printf("Number of tests that failed: %d\n", testsFailed); + return 0; +} + +int test(char * filename) +{ + AlignInfo ainf; + char* script; + OptInfo opt; + fullPath infile; + + StringtoFullPath( &infile, filename ); + script = LoadScript( &infile ); + if( script == NULL ) + { + printf("No script loaded, testing failed\n"); + return 1; + } + + if(ParseScript( script, &ainf ) != 0) + { + printf("Parsing script error, testing failed\n"); + free( script ); + return 1; + } + + if( CheckParams( &ainf ) != 0 ) + { + printf("Checking parameters failed, testing failed\n"); + DisposeAlignInfo( &ainf ); + return 1; + } + + ainf.fcn = fcnPano; + + SetGlobalPtr( &ainf ); + + opt.numVars = ainf.numParam; + opt.numData = ainf.numPts; + opt.SetVarsToX = SetLMParams; + opt.SetXToVars = SetAlignParams; + opt.fcn = ainf.fcn; + *opt.message = 0; + + RunLMOptimizer( &opt ); + //ainf.data = opt.message; + printf("%s", opt.message); + + //WriteResults( script, &infile, &ainf, distSquared, 0); + return compare(ainf);; +} + +int compare(AlignInfo ainf) +{ + + int result = 0; + +/* + //just to make life easier - code generating function + int i; + printf("if(ainf.numPts != %d);\n", ainf.numPts); + printf("if(ainf.numParam != %d);\n", ainf.numParam); + for( i=0; i < ainf.numIm; i++ ) + { + printf("if( fabs(ainf.im[%d].yaw - %g) > 1E-3 )\n{\n\tprintf(\"Comparing yaw to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].yaw, i); + printf("if( fabs(ainf.im[%d].pitch - %g) > 1E-3 )\n{\n\tprintf(\"Comparing pitch to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].pitch, i); + printf("if( fabs(ainf.im[%d].roll - %g) > 1E-3 )\n{\n\tprintf(\"Comparing roll to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].roll, i); + printf("if( fabs(ainf.im[%d].hfov - %g) > 1E-3 )\n{\n\tprintf(\"Comparing HFov to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].hfov, i); + printf("if( fabs(ainf.im[%d].cP.radial_params[0][3] - %f) > 1E-3 )\n{\n\tprintf(\"Comparing Polynomial Coefficients (a) to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].cP.radial_params[0][3], i); + printf("if( fabs(ainf.im[%d].cP.radial_params[0][2] - %f) > 1E-3 )\n{\n\tprintf(\"Comparing Polynomial Coefficients (b) to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].cP.radial_params[0][2], i); + printf("if( fabs(ainf.im[%d].cP.radial_params[0][1] - %f) > 1E-3 )\n{\n\tprintf(\"Comparing Polynomial Coefficients (c) to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].cP.radial_params[0][1], i); + printf("if( fabs(ainf.im[%d].cP.horizontal_params[0] - %f) > 1E-3 )\n{\n\tprintf(\"Comparing Horizontal Shift to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].cP.horizontal_params[0], i); + printf("if( fabs(ainf.im[%d].cP.vertical_params[0] - %f) > 1E-3 )\n{\n\tprintf(\"Comparing Vertical Shift to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].cP.vertical_params[0], i); + printf("if( fabs(ainf.im[%d].cP.tilt_x - %f) > 1E-3 )\n{\n\tprintf(\"Comparing TiltX to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].cP.tilt_x, i); + printf("if( fabs(ainf.im[%d].cP.tilt_y - %f) > 1E-3 )\n{\n\tprintf(\"Comparing TiltY to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].cP.tilt_y, i); + printf("if( fabs(ainf.im[%d].cP.tilt_z - %f) > 1E-3 )\n{\n\tprintf(\"Comparing TiltZ to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].cP.tilt_z, i); + printf("if( fabs(ainf.im[%d].cP.tilt_scale - %f) > 1E-3 )\n{\n\tprintf(\"Comparing TiltScale to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].cP.tilt_scale, i); + printf("if( fabs(ainf.im[%d].cP.trans_x - %f) > 1E-3 )\n{\n\tprintf(\"Comparing TransX to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].cP.trans_x, i); + printf("if( fabs(ainf.im[%d].cP.trans_y - %f) > 1E-3 )\n{\n\tprintf(\"Comparing TransY to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].cP.trans_y, i); + printf("if( fabs(ainf.im[%d].cP.trans_z - %f) > 1E-3 )\n{\n\tprintf(\"Comparing TransZ to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].cP.trans_z, i); + printf("if( fabs(ainf.im[%d].cP.test_p0 - %f) > 1E-3 )\n{\n\tprintf(\"Comparing Test P0 to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].cP.test_p0, i); + printf("if( fabs(ainf.im[%d].cP.test_p1 - %f) > 1E-3 )\n{\n\tprintf(\"Comparing Test P1 to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].cP.test_p1, i); + printf("if( fabs(ainf.im[%d].cP.test_p2 - %f) > 1E-3 )\n{\n\tprintf(\"Comparing Test P2 to reference failed in image %d\\n\");\n\tresult++;\n}\n", i, ainf.im[i].cP.test_p2, i); + printf("if( fabs(ainf.im[%d].cP.test_p3 - %f) > 1E-3 )\n{\n\tprintf(\"Comparing Test P3 to reference failed in image %d\\n\");\n\tresult++;\n}\n\n", i, ainf.im[i].cP.test_p3, i); + } +*/ + + if(ainf.numPts != 66) + { + printf("Comparing Number of Control Points failed\n"); + result++; + } + if(ainf.numParam != 26) + { + printf("Comparing Number of parameters to optimize failed\n"); + result++; + } + + + if( fabs(ainf.im[0].yaw - 0) > 1E-3 ) + { + printf("Comparing yaw to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].pitch - -0.808846) > 1E-3 ) + { + printf("Comparing pitch to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].roll - 1.2453) > 1E-3 ) + { + printf("Comparing roll to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].hfov - 83.2457) > 1E-3 ) + { + printf("Comparing HFov to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].cP.radial_params[0][3] - -0.027782) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (a) to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].cP.radial_params[0][2] - 0.054774) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (b) to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].cP.radial_params[0][1] - -0.073810) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (c) to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].cP.horizontal_params[0] - -33.435436) > 1E-3 ) + { + printf("Comparing Horizontal Shift to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].cP.vertical_params[0] - 1.737751) > 1E-3 ) + { + printf("Comparing Vertical Shift to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].cP.tilt_x - 0.000000) > 1E-3 ) + { + printf("Comparing TiltX to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].cP.tilt_y - 0.000000) > 1E-3 ) + { + printf("Comparing TiltY to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].cP.tilt_z - 0.000000) > 1E-3 ) + { + printf("Comparing TiltZ to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].cP.tilt_scale - 1.000000) > 1E-3 ) + { + printf("Comparing TiltScale to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].cP.trans_x - 0.000000) > 1E-3 ) + { + printf("Comparing TransX to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].cP.trans_y - 0.000000) > 1E-3 ) + { + printf("Comparing TransY to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].cP.trans_z - 0.000000) > 1E-3 ) + { + printf("Comparing TransZ to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].cP.test_p0 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P0 to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].cP.test_p1 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P1 to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].cP.test_p2 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P2 to reference failed in image 0\n"); + result++; + } + if( fabs(ainf.im[0].cP.test_p3 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P3 to reference failed in image 0\n"); + result++; + } + + if( fabs(ainf.im[1].yaw - 48.6781) > 1E-3 ) + { + printf("Comparing yaw to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].pitch - -0.806883) > 1E-3 ) + { + printf("Comparing pitch to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].roll - 0.0266826) > 1E-3 ) + { + printf("Comparing roll to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].hfov - 83.0882) > 1E-3 ) + { + printf("Comparing HFov to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].cP.radial_params[0][3] - 0.000209) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (a) to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].cP.radial_params[0][2] - -0.028288) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (b) to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].cP.radial_params[0][1] - -0.003747) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (c) to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].cP.horizontal_params[0] - -32.402200) > 1E-3 ) + { + printf("Comparing Horizontal Shift to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].cP.vertical_params[0] - 0.379041) > 1E-3 ) + { + printf("Comparing Vertical Shift to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].cP.tilt_x - 0.000000) > 1E-3 ) + { + printf("Comparing TiltX to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].cP.tilt_y - 0.000000) > 1E-3 ) + { + printf("Comparing TiltY to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].cP.tilt_z - 0.000000) > 1E-3 ) + { + printf("Comparing TiltZ to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].cP.tilt_scale - 1.000000) > 1E-3 ) + { + printf("Comparing TiltScale to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].cP.trans_x - 0.000000) > 1E-3 ) + { + printf("Comparing TransX to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].cP.trans_y - 0.000000) > 1E-3 ) + { + printf("Comparing TransY to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].cP.trans_z - 0.000000) > 1E-3 ) + { + printf("Comparing TransZ to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].cP.test_p0 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P0 to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].cP.test_p1 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P1 to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].cP.test_p2 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P2 to reference failed in image 1\n"); + result++; + } + if( fabs(ainf.im[1].cP.test_p3 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P3 to reference failed in image 1\n"); + result++; + } + + if( fabs(ainf.im[2].yaw - 88.6269) > 1E-3 ) + { + printf("Comparing yaw to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].pitch - -0.06792) > 1E-3 ) + { + printf("Comparing pitch to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].roll - -0.718207) > 1E-3 ) + { + printf("Comparing roll to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].hfov - 83.0882) > 1E-3 ) + { + printf("Comparing HFov to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].cP.radial_params[0][3] - 0.000209) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (a) to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].cP.radial_params[0][2] - -0.028288) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (b) to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].cP.radial_params[0][1] - -0.003747) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (c) to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].cP.horizontal_params[0] - -32.402200) > 1E-3 ) + { + printf("Comparing Horizontal Shift to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].cP.vertical_params[0] - 0.379041) > 1E-3 ) + { + printf("Comparing Vertical Shift to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].cP.tilt_x - 0.000000) > 1E-3 ) + { + printf("Comparing TiltX to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].cP.tilt_y - 0.000000) > 1E-3 ) + { + printf("Comparing TiltY to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].cP.tilt_z - 0.000000) > 1E-3 ) + { + printf("Comparing TiltZ to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].cP.tilt_scale - 1.000000) > 1E-3 ) + { + printf("Comparing TiltScale to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].cP.trans_x - 0.000000) > 1E-3 ) + { + printf("Comparing TransX to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].cP.trans_y - 0.000000) > 1E-3 ) + { + printf("Comparing TransY to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].cP.trans_z - 0.000000) > 1E-3 ) + { + printf("Comparing TransZ to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].cP.test_p0 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P0 to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].cP.test_p1 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P1 to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].cP.test_p2 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P2 to reference failed in image 2\n"); + result++; + } + if( fabs(ainf.im[2].cP.test_p3 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P3 to reference failed in image 2\n"); + result++; + } + + if( fabs(ainf.im[3].yaw - 138.134) > 1E-3 ) + { + printf("Comparing yaw to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].pitch - 1.18807) > 1E-3 ) + { + printf("Comparing pitch to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].roll - -0.660666) > 1E-3 ) + { + printf("Comparing roll to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].hfov - 83.0882) > 1E-3 ) + { + printf("Comparing HFov to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].cP.radial_params[0][3] - 0.000209) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (a) to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].cP.radial_params[0][2] - -0.028288) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (b) to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].cP.radial_params[0][1] - -0.003747) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (c) to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].cP.horizontal_params[0] - -32.402200) > 1E-3 ) + { + printf("Comparing Horizontal Shift to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].cP.vertical_params[0] - 0.379041) > 1E-3 ) + { + printf("Comparing Vertical Shift to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].cP.tilt_x - 0.000000) > 1E-3 ) + { + printf("Comparing TiltX to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].cP.tilt_y - 0.000000) > 1E-3 ) + { + printf("Comparing TiltY to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].cP.tilt_z - 0.000000) > 1E-3 ) + { + printf("Comparing TiltZ to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].cP.tilt_scale - 1.000000) > 1E-3 ) + { + printf("Comparing TiltScale to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].cP.trans_x - 0.000000) > 1E-3 ) + { + printf("Comparing TransX to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].cP.trans_y - 0.000000) > 1E-3 ) + { + printf("Comparing TransY to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].cP.trans_z - 0.000000) > 1E-3 ) + { + printf("Comparing TransZ to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].cP.test_p0 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P0 to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].cP.test_p1 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P1 to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].cP.test_p2 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P2 to reference failed in image 3\n"); + result++; + } + if( fabs(ainf.im[3].cP.test_p3 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P3 to reference failed in image 3\n"); + result++; + } + + if( fabs(ainf.im[4].yaw - 179.178) > 1E-3 ) + { + printf("Comparing yaw to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].pitch - 1.77503) > 1E-3 ) + { + printf("Comparing pitch to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].roll - 0.0913396) > 1E-3 ) + { + printf("Comparing roll to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].hfov - 83.0882) > 1E-3 ) + { + printf("Comparing HFov to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].cP.radial_params[0][3] - 0.000209) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (a) to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].cP.radial_params[0][2] - -0.028288) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (b) to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].cP.radial_params[0][1] - -0.003747) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (c) to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].cP.horizontal_params[0] - -32.402200) > 1E-3 ) + { + printf("Comparing Horizontal Shift to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].cP.vertical_params[0] - 0.379041) > 1E-3 ) + { + printf("Comparing Vertical Shift to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].cP.tilt_x - 0.000000) > 1E-3 ) + { + printf("Comparing TiltX to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].cP.tilt_y - 0.000000) > 1E-3 ) + { + printf("Comparing TiltY to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].cP.tilt_z - 0.000000) > 1E-3 ) + { + printf("Comparing TiltZ to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].cP.tilt_scale - 1.000000) > 1E-3 ) + { + printf("Comparing TiltScale to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].cP.trans_x - 0.000000) > 1E-3 ) + { + printf("Comparing TransX to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].cP.trans_y - 0.000000) > 1E-3 ) + { + printf("Comparing TransY to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].cP.trans_z - 0.000000) > 1E-3 ) + { + printf("Comparing TransZ to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].cP.test_p0 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P0 to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].cP.test_p1 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P1 to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].cP.test_p2 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P2 to reference failed in image 4\n"); + result++; + } + if( fabs(ainf.im[4].cP.test_p3 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P3 to reference failed in image 4\n"); + result++; + } + + if( fabs(ainf.im[5].yaw - -130.025) > 1E-3 ) + { + printf("Comparing yaw to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].pitch - 1.78619) > 1E-3 ) + { + printf("Comparing pitch to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].roll - 1.26377) > 1E-3 ) + { + printf("Comparing roll to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].hfov - 83.0882) > 1E-3 ) + { + printf("Comparing HFov to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].cP.radial_params[0][3] - 0.000209) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (a) to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].cP.radial_params[0][2] - -0.028288) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (b) to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].cP.radial_params[0][1] - -0.003747) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (c) to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].cP.horizontal_params[0] - -32.402200) > 1E-3 ) + { + printf("Comparing Horizontal Shift to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].cP.vertical_params[0] - 0.379041) > 1E-3 ) + { + printf("Comparing Vertical Shift to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].cP.tilt_x - 0.000000) > 1E-3 ) + { + printf("Comparing TiltX to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].cP.tilt_y - 0.000000) > 1E-3 ) + { + printf("Comparing TiltY to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].cP.tilt_z - 0.000000) > 1E-3 ) + { + printf("Comparing TiltZ to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].cP.tilt_scale - 1.000000) > 1E-3 ) + { + printf("Comparing TiltScale to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].cP.trans_x - 0.000000) > 1E-3 ) + { + printf("Comparing TransX to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].cP.trans_y - 0.000000) > 1E-3 ) + { + printf("Comparing TransY to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].cP.trans_z - 0.000000) > 1E-3 ) + { + printf("Comparing TransZ to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].cP.test_p0 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P0 to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].cP.test_p1 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P1 to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].cP.test_p2 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P2 to reference failed in image 5\n"); + result++; + } + if( fabs(ainf.im[5].cP.test_p3 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P3 to reference failed in image 5\n"); + result++; + } + + if( fabs(ainf.im[6].yaw - -89.2924) > 1E-3 ) + { + printf("Comparing yaw to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].pitch - 1.11473) > 1E-3 ) + { + printf("Comparing pitch to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].roll - 1.92667) > 1E-3 ) + { + printf("Comparing roll to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].hfov - 83.0882) > 1E-3 ) + { + printf("Comparing HFov to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].cP.radial_params[0][3] - 0.000209) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (a) to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].cP.radial_params[0][2] - -0.028288) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (b) to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].cP.radial_params[0][1] - -0.003747) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (c) to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].cP.horizontal_params[0] - -32.402200) > 1E-3 ) + { + printf("Comparing Horizontal Shift to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].cP.vertical_params[0] - 0.379041) > 1E-3 ) + { + printf("Comparing Vertical Shift to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].cP.tilt_x - 0.000000) > 1E-3 ) + { + printf("Comparing TiltX to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].cP.tilt_y - 0.000000) > 1E-3 ) + { + printf("Comparing TiltY to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].cP.tilt_z - 0.000000) > 1E-3 ) + { + printf("Comparing TiltZ to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].cP.tilt_scale - 1.000000) > 1E-3 ) + { + printf("Comparing TiltScale to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].cP.trans_x - 0.000000) > 1E-3 ) + { + printf("Comparing TransX to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].cP.trans_y - 0.000000) > 1E-3 ) + { + printf("Comparing TransY to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].cP.trans_z - 0.000000) > 1E-3 ) + { + printf("Comparing TransZ to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].cP.test_p0 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P0 to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].cP.test_p1 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P1 to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].cP.test_p2 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P2 to reference failed in image 6\n"); + result++; + } + if( fabs(ainf.im[6].cP.test_p3 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P3 to reference failed in image 6\n"); + result++; + } + + if( fabs(ainf.im[7].yaw - -42.525) > 1E-3 ) + { + printf("Comparing yaw to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].pitch - -0.0144794) > 1E-3 ) + { + printf("Comparing pitch to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].roll - 1.88377) > 1E-3 ) + { + printf("Comparing roll to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].hfov - 83.0882) > 1E-3 ) + { + printf("Comparing HFov to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].cP.radial_params[0][3] - 0.000209) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (a) to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].cP.radial_params[0][2] - -0.028288) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (b) to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].cP.radial_params[0][1] - -0.003747) > 1E-3 ) + { + printf("Comparing Polynomial Coefficients (c) to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].cP.horizontal_params[0] - -32.402200) > 1E-3 ) + { + printf("Comparing Horizontal Shift to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].cP.vertical_params[0] - 0.379041) > 1E-3 ) + { + printf("Comparing Vertical Shift to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].cP.tilt_x - 0.000000) > 1E-3 ) + { + printf("Comparing TiltX to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].cP.tilt_y - 0.000000) > 1E-3 ) + { + printf("Comparing TiltY to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].cP.tilt_z - 0.000000) > 1E-3 ) + { + printf("Comparing TiltZ to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].cP.tilt_scale - 1.000000) > 1E-3 ) + { + printf("Comparing TiltScale to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].cP.trans_x - 0.000000) > 1E-3 ) + { + printf("Comparing TransX to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].cP.trans_y - 0.000000) > 1E-3 ) + { + printf("Comparing TransY to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].cP.trans_z - 0.000000) > 1E-3 ) + { + printf("Comparing TransZ to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].cP.test_p0 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P0 to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].cP.test_p1 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P1 to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].cP.test_p2 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P2 to reference failed in image 7\n"); + result++; + } + if( fabs(ainf.im[7].cP.test_p3 - 0.000000) > 1E-3 ) + { + printf("Comparing Test P3 to reference failed in image 7\n"); + result++; + } + + return result; +} + Added: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/distSquaredTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/distSquaredTest.c (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/distSquaredTest.c 2010-08-09 03:57:06 UTC (rev 1290) @@ -0,0 +1,63 @@ +/* + * distSquaredTest.c + * + * Tests distSquared function. + * + * July 2010 + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Tomasz Meger + * + */ + +#include "filter.h" +#include <stdio.h> + +static AlignInfo *optInfo; + +int main(int argc, char *argv[]) +{ + AlignInfo ainf; + char* script; + fullPath infile; + int testsFailed = 0; + int result; + + StringtoFullPath( &infile, "optimizer.txt" ); + script = LoadScript( &infile ); + ParseScript( script, &ainf ); + SetGlobalPtr( &ainf ); + + if (fabs(distSquared(0) - 0.85436) < 1E-5) testsFailed++; + if (fabs(distSquared(0) - 0.445436) > 1E-5) testsFailed++; + if (fabs(distSquared(1) - 1.856560) > 1E-5) testsFailed++; + if (fabs(distSquared(3) - 0.720202) > 1E-5) testsFailed++; + if (fabs(distSquared(5) - 0.212486) > 1E-5) testsFailed++; + if (fabs(distSquared(50) - 5.778498) > 1E-5) testsFailed++; + if (fabs(distSquared(2) - 0.180449) > 1E-5) testsFailed++; + if (fabs(distSquared(4) - 0.133583) > 1E-5) testsFailed++; + if (fabs(distSquared(52) - 2.248545) > 1E-5) testsFailed++; + if (fabs(distSquared(12) - 0.091332) > 1E-5) testsFailed++; + if (fabs(distSquared(8) - 1.003247) > 1E-5) testsFailed++; + if (fabs(distSquared(10) - 0.153346) > 1E-5) testsFailed++; + if (fabs(distSquared(15) - 1.318578) > 1E-5) testsFailed++; + if (fabs(distSquared(-5) - 0.000000) > 1E-5) testsFailed++; + + printf("Number of tests that failed: %d\n", testsFailed); + return 0; +} + + Added: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_albersequalareaconicTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_albersequalareaconicTest.c (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_albersequalareaconicTest.c 2010-08-09 03:57:06 UTC (rev 1290) @@ -0,0 +1,103 @@ +/* + * erect_albersequalareaconicTest.c + * + * Tests erect_albersequalareaconic function. + * + * July 2010 + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Tomasz Meger + * + */ + +#include "filter.h" +#include "dump.h" +#include <stdio.h> + + +void setInputImage(Image *im) +{ + im->width = 800; + im->height = 600; + im->bytesPerLine = 0; + im->bitsPerPixel = 24; // Must be 24 or 32 + im->dataSize = 0; +/* pt_int32 dataformat; // rgb, Lab etc + pt_int32 format; // Projection: rectilinear etc + int formatParamCount; // Number of format parameters. + double formatParam[PANO_PROJECTION_MAX_PARMS]; // Parameters for format. + int precomputedCount; // number of values precomputed for a given pano + double precomputedValue[PANO_PROJECTION_PRECOMPUTED_VALUES]; // to speed up pano creation + double hfov; + double yaw; + double pitch; + double roll; + cPrefs cP; // How to correct the image + char name[PANO_PATH_LEN+1]; + PTRect selection; + CropInfo cropInformation; // TO BE DEPRECATED + + pano_ImageMetadata metadata;*/ +} + +void setOutputImage(Image *im) +{ + im->width = 800; + im->height = 600; + im->bytesPerLine = 0; + im->bitsPerPixel = 24; // Must be 24 or 32 + im->dataSize = 0; +/* pt_int32 dataformat; // rgb, Lab etc + pt_int32 format; // Projection: rectilinear etc + int formatParamCount; // Number of format parameters. + double formatParam[PANO_PROJECTION_MAX_PARMS]; // Parameters for format. + int precomputedCount; // number of values precomputed for a given pano + double precomputedValue[PANO_PROJECTION_PRECOMPUTED_VALUES]; // to speed up pano creation + double hfov; + double yaw; + double pitch; + double roll; + cPrefs cP; // How to correct the image + char name[PANO_PATH_LEN+1]; + PTRect selection; + CropInfo cropInformation; // TO BE DEPRECATED + + pano_ImageMetadata metadata;*/ +} + +int main(int argc, char *argv[]) +{ + //aPrefs aP; + struct MakeParams mp; + //fDesc stack[15]; + double x, y; + //SetAdjustDefaults(&aP); + //Pano_Dump_Adjust_Data(&aP, NULL, 0); + Image im1; + Image im2; + fDesc stack[15]; + setInputImage(&im1); + setOutputImage(&im2); + Pano_Dump_Image(&im1, NULL, 0); +// SetMakeParams( stack, &mp, &im1, &im2, 0 ); +// int result = erect_albersequalareaconic(0.0, 0.0, &x, &y, stack->params); +// if (result == 0) +// { +// printf ("Param check failed\n"); +// } + return 0; +} + Added: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/optimizer.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/optimizer.txt (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/optimizer.txt 2010-08-09 03:57:06 UTC (rev 1290) @@ -0,0 +1,93 @@ +# Created by Panotools::Script 0.25 + +p f2 h1500 n"TIFF_m c:NONE" v360 w3000 +m f0 g1 i0 m2 p0.00784314 + +# Image lines +i TrX0 TrY0 TrZ0 a0.000209152 b-0.0282883 c-0.00374658 d-32.4022 e0.379041 f3 g0 h3504 n"./070322_6440.JPG" p-0.739786 r1.23268 t0 v83.0882 w2336 y0 +i TrX0 TrY0 TrZ0 a0.000209152 b-0.0282883 c-0.00374658 d-32.4022 e0.379041 f3 g0 h3504 n"./070322_6443.JPG" p-0.772426 r0.0634678 t0 v83.0882 w2336 y48.6043 +i TrX0 TrY0 TrZ0 a0.000209152 b-0.0282883 c-0.00374658 d-32.4022 e0.379041 f3 g0 h3504 n"./070322_6446.JPG" p-0.067337 r-0.652717 t0 v83.0882 w2336 y88.5627 +i TrX0 TrY0 TrZ0 a0.000209152 b-0.0282883 c-0.00374658 d-32.4022 e0.379041 f3 g0 h3504 n"./070322_6449.JPG" p1.15348 r-0.632612 t0 v83.0882 w2336 y138.084 +i TrX0 TrY0 TrZ0 a0.000209152 b-0.0282883 c-0.00374658 d-32.4022 e0.379041 f3 g0 h3504 n"./070322_6452.JPG" p1.73747 r0.0903612 t0 v83.0882 w2336 y179.141 +i TrX0 TrY0 TrZ0 a0.000209152 b-0.0282883 c-0.00374658 d-32.4022 e0.379041 f3 g0 h3504 n"./070322_6455.JPG" p1.76502 r1.24336 t0 v83.0882 w2336 y-130.051 +i TrX0 TrY0 TrZ0 a0.000209152 b-0.0282883 c-0.00374658 d-32.4022 e0.379041 f3 g0 h3504 n"./070322_6458.JPG" p1.10837 r1.91459 t0 v83.0882 w2336 y-89.3071 +i TrX0 TrY0 TrZ0 a0.000209152 b-0.0282883 c-0.00374658 d-32.4022 e0.379041 f3 g0 h3504 n"./070322_6461.JPG" p-0.0144794 r1.88377 t0 v83.0882 w2336 y-42.525 + +# Variable lines +v a0 b0 c0 d0 e0 p0 r0 v0 +v X1 Y1 Z1 p1 r1 y1 +v X2 Y2 Z2 p2 r2 y2 +v X3 Y3 Z3 p3 r3 y3 +v X4 Y4 Z4 p4 r4 y4 +v X5 Y5 Z5 p5 r5 y5 +v X6 Y6 Z6 p6 r6 y6 +v + +# Control point lines +c N1 X1297.01 Y3148.65 n0 t0 x2204 y3253 +c N1 X967.357 Y490.873 n0 t0 x1989 y413 +c N2 X155 Y415 n0 t0 x1989.21 y411.99 +c N2 X498.179 Y3194.61 n0 t0 x2203 y3252 +c N2 X497.052 Y3192.78 n1 t0 x1295 y3146 +c N2 X155.096 Y418.234 n1 t0 x974 y490 +c N3 X313.701 Y3328.4 n2 t0 x1210 y3238 +c N3 X12 Y712 n1 t0 x2132 y697 +c N3 X314 Y3327 n1 t0 x1938 y3299 +c N3 X12 Y710 n2 t0 x1184 y771 +c N2 X1796.66 Y3390.12 n3 t0 x960 y3351 +c N2 X1185 Y772 n1 t0 x2131.5 y696.5 +c N2 X1208.5 Y3237.5 n1 t0 x1936.5 y3297.5 +c N4 X84 Y358 n2 t0 x1915 y384 +c N4 X316 Y3452.5 n2 t0 x1797 y3392 +c N4 X316.298 Y3453.41 n3 t0 x961 y3353 +c N4 X131 Y283 n3 t0 x896.5 y377.5 +c N2 X1873 Y313 n3 t0 x895.183 y377.332 +c N4 X1544 Y338.5 n3 t0 x2247.5 y197.5 +c N4 X1379.84 Y3100.81 n3 t0 x2176.5 y3188 +c N5 X340.008 Y3164.55 n4 t0 x1378 y3099 +c N5 X541.5 Y335 n4 t0 x1542.5 y339 +c N5 X1242.66 Y3161.58 n4 t0 x2187 y3265 +c N5 X934.5 Y862 n4 t0 x2186.5 y791 +c N6 X447.037 Y3219.33 n5 t0 x1246 y3163 +c N6 X261.5 Y882.5 n5 t0 x1291.5 y904 +c N6 X1311 Y3023 n5 t0 x2157.5 y3097.5 +c N6 X1216.37 Y678.542 n5 t0 x2140 y596 +c N7 X307.5 Y3086.5 n6 t0 x1310.5 y3023.5 +c N7 X141 Y625.5 n6 t0 x1213.5 y679.5 +c N7 X1012.5 Y275 n6 t0 x1856.5 y199 +c N7 X972 Y3099 n6 t0 x1933 y3143.5 +c N0 X265.5 Y196.5 n7 t0 x1012 y275 +c N0 X137.5 Y3200 n7 t0 x972 y3099 +c N0 X1089 Y988 n7 t0 x2176.5 y928.5 +c N0 X1159.5 Y3106 n7 t0 x2013 y3163.5 +c N1 X195.5 Y3202 n0 t0 x1160.5 y3105.5 +c N1 X68.5 Y1232 n0 t0 x1390 y1246.5 +c N1 X208 Y2037 n0 t0 x1581.84 y2015.84 +c N1 X953 Y1964 n0 t0 x2316 y1959 +c N2 X165.872 Y1941.61 n1 t0 x1297 y1923 +c N2 X1129 Y2041.5 n1 t0 x2242 y2044.5 +c N3 X199 Y1870.5 n2 t0 x1608.51 y1852.44 +c N3 X815 Y1804 n2 t0 x2218 y1788.5 +c N4 X64.0575 Y1886.77 n3 t0 x1224 y1870.5 +c N4 X1130.5 Y1824.5 n3 t0 x2287.05 y1814.06 +c N5 X127.608 Y1827.31 n4 t0 x1572 y1810.5 +c N5 X861 Y1877 n4 t0 x2294.72 y1865.69 +c N6 X148.959 Y1681.98 n5 t0 x1302.5 y1674 +c N6 X1036 Y1975 n5 t0 x2181.78 y1969.91 +c N7 X114.347 Y1777.22 n6 t0 x1438.5 y1762.5 +c N7 X981.561 Y1817.08 n6 t0 x2297 y1802 +c N0 X102.617 Y1767.47 n7 t0 x1305.5 y1755.5 +c N0 X1110 Y1765 n7 t0 x2303.83 y1749.77 +c N5 X540 Y334 n3 t0 x2247.5 y197 +c N5 X340 Y3167 n3 t0 x2175.28 y3188.8 +c N6 X443.5 Y3219 n4 t0 x2187 y3266 +c N6 X28 Y216 n4 t0 x1718.5 y302.5 +c N5 X729 Y336.5 n4 t0 x1720.5 y304 +c N7 X141 Y625.5 n5 t0 x2139.5 y596 +c N7 X311.5 Y3087 n5 t0 x2157 y3098 +c N0 X266 Y194.5 n6 t0 x1856 y196 +c N0 X137 Y3200.5 n6 t0 x1933.5 y3143 +c N1 X197 Y3201 n7 t0 x2012 y3165.5 +c N1 X637 Y1224 n1 t1 x637.5 y2218 +c N5 X832 Y1296 n5 t1 x888.5 y2731.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tom...@us...> - 2010-08-16 14:33:41
|
Revision: 1294 http://panotools.svn.sourceforge.net/panotools/?rev=1294&view=rev Author: tomaszmeger Date: 2010-08-16 14:33:30 +0000 (Mon, 16 Aug 2010) Log Message: ----------- Added tests for other functions including: - resize, - queryFOVLimits (it also tests panoProjectionFeaturesQuery and panoProjectionFormatCount), - vert, - horiz, - rotate erect, Add some more tests to the existing projection related tests and modified README.TXT file. Modified Paths: -------------- branches/libpano_gsoc2010_regtests/tests/gsoc/README.TXT branches/libpano_gsoc2010_regtests/tests/gsoc/functions/CMakeLists.txt branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_mercatorTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_panoTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_rectTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_sinusoidalTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_sphere_tpTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_stereographicTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/mercator_erectTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/pano_erectTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/pano_sphere_tpTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/rect_erectTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/rect_sphere_tpTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/sinusoidal_erectTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/sphere_tp_erectTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/sphere_tp_panoTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/sphere_tp_rectTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/stereographic_erectTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/transmercator_erectTest.c Added Paths: ----------- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/horizTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/queryFOVLimitsTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/resizeTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/rotate_erectTest.c branches/libpano_gsoc2010_regtests/tests/gsoc/functions/vertTest.c Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/README.TXT =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/README.TXT 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/README.TXT 2010-08-16 14:33:30 UTC (rev 1294) @@ -1,35 +1,173 @@ -Right now the only way to run the tests is go to the directory with one of the -inputs (f1, f2 ,f3, f4) and type `perl ../gen.pl test.txt` to start it -manually. +General overview +Tests are divided into 2 different areas: +- first that test PTtools +- second that test at function level -It is also possible to add tests using existing project in a few steps. +Usage of the tests +- run all test at once might be not a good idea unless we have much time +- for running individual tests use ctest -R test_name. +- for omitting individual tests use ctest -E test_name. +- for listing all the available tests use ctest -N +- for enabling verbose output from tests use -V or -VV option +- for more info about ctest read http://www.cmake.org/Wiki/CMake_Testing_With_CTest#Running_Individual_Tests +- example1: ctest -R function* -VV will run only function level tests +- example2: ctest -E function* -VV will not run function level tests other tests +for tools will be running +- read CMakeLists.txt for more info about framework examples of usage. + +Creating new tests for the tools (gen.pl) +It is possible to add tests using existing project in a few steps. 1a. Use resizer. - it is using scale for resize operations - copy jpg files and pto file into one directory - perl resizer.pl pto_in.pto pto_out.pto - -or - + OR 1b. Use resizer2. - it is using common denominators for resize operations - copy jpg files and pto file into one directory - perl resizer.pl pto_in.pto pto_out.pto - - use common denominator by typing it in console (available common denominators will appear) - + - use common denominator by typing it in console (available common denominators +will appear) 2. Script generation. -Open pto file in hugin and generate a script, if you used resizer2 error about control points may occur - press OK, and control points will be removed (I assume that tests are made for PTmender testing). - +Open pto file in hugin and generate a script, if you used resizer2 error about +control points may occur - press OK, and control points will be removed +(I assume that tests are made for PTmender testing). 3. Test generation. typing perl gen.pl will generate tests. -In gen.pl file we can manipulate formats and projections arrays. In formats array we can decide which of the formats use to create tests. Structure of projection array element: +In gen.pl file we can manipulate formats and projections arrays. In formats +array we can decide which of the formats use to create tests. Structure of +projection array element: - name used in filename and in directory naming, - projection format, - horizontal field of view of panorama, - vertical field of view of panorama (ignored), - width in pixels - height in pixels -Adding or removing projection is easy by just adding or removing (commenting) element in array. -for create reference change the line 117 from: - `python ../panoAutomateTest.py $path`; - to - `python ../panoAutomateTest.py -c $path`; +4. Use tool you want to test by using the correct param, -r parameter will +create reference files (read help to gen.pl for more info). + +Creating new tests for the tools (optTest.pl) +1. Create script for PToptimizer +2. Just use -r parameter to create reference files. +3. Add test into cmake. + +Creating new tests for the tools (parser.pl) +1. Read parser.pl help and select parameter(s) you want to test. +2. Set $newReference to 1 or copy ./parser_test.txt to ./parser_reference.txt. +3. Add test into cmake. + +Creating new tests for the tools (function level) +- one way to do this is to modify the existing code in most cases it is possible +to add additional custom tests. + +List of tools related tests (ctest names): + Test #3: simple_f0 + Test #4: parameter_f0 + Test #5: parser_f0_formats + Test #6: parser_f0_projections + Test #7: parser_f0_interpolators + Test #8: parser_f0_a + Test #9: parser_f0_b + Test #10: parser_f0_c + Test #11: parser_f0_d + Test #12: parser_f0_e + Test #13: parser_f0_g + Test #14: parser_f0_t + Test #15: parser_f0_a_b_c + Test #16: parser_f0_d_e + Test #17: parser_f0_g_t + Test #18: parser_f0_projections_and_formats + Test #19: PToptimizer_f0 + Test #20: PTroller_f0 + Test #21: PTcrop_f0 + Test #22: PTuncrop_f0 + Test #23: PTtiff2psd_f0 + Test #24: simple_f1 + Test #25: formats + Test #26: projections_f1 + Test #27: parser_f1_formats + Test #28: parser_f1_projections + Test #29: parser_f1_interpolators + Test #30: parser_f1_a + Test #31: parser_f1_b + Test #32: parser_f1_c + Test #33: parser_f1_d + Test #34: parser_f1_e + Test #35: parser_f1_g + Test #36: parser_f1_t + Test #37: parser_f1_projections_and_formats + Test #38: parser_f1_a_b_c + Test #39: parser_f1_d_e + Test #40: parser_f1_g_t + Test #41: simple_f2 + Test #42: parameter_f2 + Test #43: parser_f2_formats + Test #44: parser_f2_projections + Test #45: parser_f2_interpolators + Test #46: parser_f2_a + Test #47: parser_f2_b + Test #48: parser_f2_c + Test #49: parser_f2_d + Test #50: parser_f2_e + Test #51: parser_f2_g + Test #52: parser_f2_t + Test #53: parser_f2_projections_and_formats + Test #54: parser_f2_a_b_c + Test #55: parser_f2_d_e + Test #56: parser_f2_g_t + Test #57: PToptimizer_f2 + Test #58: PTroller_f2 + Test #59: PTcrop_f2 + Test #60: PTuncrop_f2 + Test #61: PTtiff2psd_f2 + Test #62: simple_f3 + Test #63: parser_f3_formats + Test #64: parser_f3_projections + Test #65: parser_f3_interpolators + Test #66: parser_f3_a + Test #67: parser_f3_b + Test #68: parser_f3_c + Test #69: parser_f3_d + Test #70: parser_f3_e + Test #71: parser_f3_g + Test #72: parser_f3_t + Test #73: parser_f3_projections_and_formats + Test #74: parser_f3_a_b_c + Test #75: parser_f3_d_e + Test #76: parser_f3_g_t + Test #77: PToptimizer_f3 + Test #78: PTroller_f3 + Test #79: PTcrop_f3 + Test #80: PTuncrop_f3 + Test #81: PTtiff2psd_f3 + + +Functions that are tested (ctest names): + Test #82: function_CheckParams + Test #83: function_distSquared + Test #84: function_RunLMOptimizer + Test #85: function_transmercator_erect + Test #86: function_erect_transmercator + Test #87: function_stereographic_erect + Test #88: function_erect_stereographic + Test #89: function_sinusoidal_erect + Test #90: function_erect_sinusoidal + Test #91: function_rect_erect + Test #92: function_erect_rect + Test #93: function_pano_erect + Test #94: function_erect_pano + Test #95: function_mercator_erect + Test #96: function_erect_mercator + Test #97: function_sphere_tp_erect + Test #98: function_erect_sphere_tp + Test #99: function_sphere_tp_pano + Test #100: function_pano_sphere_tp + Test #101: function_sphere_tp_rect + Test #102: function_rect_sphere_tp + Test #103: function_queryFOVLimits + Test #104: function_horiz + Test #105: function_vert + Test #106: function_resize + Test #107: function_rotate_erect + + Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/CMakeLists.txt =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/CMakeLists.txt 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/CMakeLists.txt 2010-08-16 14:33:30 UTC (rev 1294) @@ -31,6 +31,11 @@ pano_sphere_tpTest sphere_tp_rectTest rect_sphere_tpTest + queryFOVLimitsTest + horizTest + vertTest + resizeTest + rotate_erectTest ) @@ -90,7 +95,12 @@ set_test_f(function_sphere_tp_erect "${CMAKE_CURRENT_BINARY_DIR}/sphere_tp_erectTest") set_test_f(function_erect_sphere_tp "${CMAKE_CURRENT_BINARY_DIR}/erect_sphere_tpTest") set_test_f(function_sphere_tp_pano "${CMAKE_CURRENT_BINARY_DIR}/sphere_tp_panoTest") -set_test_f(function_pano_sphere_tp "${CMAKE_CURRENT_BINARY_DIR}/pano_tp_panoTest") +set_test_f(function_pano_sphere_tp "${CMAKE_CURRENT_BINARY_DIR}/pano_sphere_tpTest") set_test_f(function_sphere_tp_rect "${CMAKE_CURRENT_BINARY_DIR}/sphere_tp_rectTest") set_test_f(function_rect_sphere_tp "${CMAKE_CURRENT_BINARY_DIR}/rect_sphere_tpTest") +set_test_f(function_queryFOVLimits "${CMAKE_CURRENT_BINARY_DIR}/queryFOVLimitsTest") +set_test_f(function_horiz "${CMAKE_CURRENT_BINARY_DIR}/horizTest") +set_test_f(function_vert "${CMAKE_CURRENT_BINARY_DIR}/vertTest") +set_test_f(function_resize "${CMAKE_CURRENT_BINARY_DIR}/resizeTest") +set_test_f(function_rotate_erect "${CMAKE_CURRENT_BINARY_DIR}/rotate_erectTest") Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_mercatorTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_mercatorTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_mercatorTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -375,14 +375,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -393,6 +393,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.726646, 5.236037); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575959, 0.575955); + result += Custom(300.14, -222.0, 5.238431, -3.873662); + result += Custom(0.0, 77.14, 0.0, 1.346306); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.472930, 4.475275); + result += Custom(91.14, -0.0, 1.590693, 0.0); + result += Custom(-333.0, 31.14, -5.811946, 0.543493); + result += Custom(-100.2, -100.2, -1.748820, -1.748731); return result; } Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_panoTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_panoTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_panoTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -375,14 +375,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -393,6 +393,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.726646, 5.233647); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575959, 0.575955); + result += Custom(300.14, -222.0, 5.238431, -3.872694); + result += Custom(0.0, 77.14, 0.0, 1.346266); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.472930, 4.473782); + result += Custom(91.14, -0.0, 1.590693, 0.0); + result += Custom(-333.0, 31.14, -5.811946, 0.543493); + result += Custom(-100.2, -100.2, -1.748820, -1.748642); return result; } Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_rectTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_rectTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_rectTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -375,14 +375,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -393,6 +393,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.704595, 5.213868); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575959, 0.575943); + result += Custom(300.14, -222.0, 5.233647, -3.867396); + result += Custom(0.0, 77.14, 0.0, 1.346266); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.469950, 4.469320); + result += Custom(91.14, -0.0, 1.590559, 0.0); + result += Custom(-333.0, 31.14, -5.805416, 0.542575); + result += Custom(-100.2, -100.2, -1.748642, -1.748374); return result; } Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_sinusoidalTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_sinusoidalTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_sinusoidalTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -375,14 +375,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -393,6 +393,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.738633, 5.238431); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575959, 0.575959); + result += Custom(300.14, -222.0, 5.242366, -3.874631); + result += Custom(0.0, 77.14, 0.0, 1.346347); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.477416, 4.476770); + result += Custom(91.14, -0.0, 1.590693, 0.0); + result += Custom(-333.0, 31.14, -5.812032, 0.543496); + result += Custom(-100.2, -100.2, -1.749087, -1.748820); return result; } Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_sphere_tpTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_sphere_tpTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_sphere_tpTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -375,14 +375,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -393,6 +393,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.734625, 5.231778); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575959, 0.575959); + result += Custom(300.14, -222.0, 5.241053, -3.872858); + result += Custom(0.0, 77.14, 0.0, 1.346347); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.475919, 4.475276); + result += Custom(91.14, -0.0, 1.590693, 0.0); + result += Custom(-333.0, 31.14, -5.812004, 0.543190); + result += Custom(-100.2, -100.2, -1.748998, -1.748731); return result; } Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_stereographicTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_stereographicTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/erect_stereographicTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -376,14 +376,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -394,6 +394,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.727083, 5.227280); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575959, 0.575959); + result += Custom(300.14, -222.0, 5.239198, -3.871490); + result += Custom(0.0, 77.14, 0.0, 1.346327); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.474424, 4.473784); + result += Custom(91.14, -0.0, 1.590660, 0.0); + result += Custom(-333.0, 31.14, -5.810354, 0.543036); + result += Custom(-100.2, -100.2, -1.748909, -1.748642); return result; } Added: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/horizTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/horizTest.c (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/horizTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -0,0 +1,76 @@ +/* + * horizTest.c + * + * Tests horiz function. + * + * August 2010 + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Tomasz Meger + * + */ + +#include "filter.h" +#include <stdio.h> + +#define DEBUG_TEST 0 +#define CMP_VALUE 1E-5 +#define FUNCTION horiz + +int Custom(double x_dest, double y_dest, double x_ref, double y_ref, double vshift); + +int main(int argc, char *argv[]) +{ + int testsFailed = 0; + + //just some simple test cases + testsFailed += Custom(0.5, 0.5, 1.0, 0.5, 0.5); + testsFailed += Custom(0.5, 0.5, 16.0, 0.5, 15.5); + testsFailed += Custom(-0.5, -0.5, 0.0, -0.5, 0.5); + testsFailed += Custom(0.1, -0.1, -0.4, -0.1, -0.5); + testsFailed += Custom(0.5, 0.1, 1.0, 0.1, 0.5); + testsFailed += Custom(0.0, 0.0, 0.0, 0.0, 0.0); + testsFailed += Custom(8.5, 12345888.987653, 1111119.0, 12345888.987653, 1111110.5); + + printf("Number of tests that failed: %d\n", testsFailed); + return 0; +} + +int Custom(double x_dest, double y_dest, double x_ref, double y_ref, double vshift) +{ + double x_src; + double y_src; + int result = 0; + + FUNCTION(x_dest, y_dest, &x_src, &y_src, &vshift); + + if( fabs(y_dest - y_ref) > CMP_VALUE ) //testing if x is the same + { + printf("Current (x) = %lf\n", x_dest); + printf("Current (y) = %lf\n", y_dest); + printf("Test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + result++; + } + if( fabs(x_src - x_ref) > CMP_VALUE ) //testing if y is the same + { + printf("Current (x) = %lf\n", x_dest); + printf("Current (y) = %lf\n", y_dest); + printf("Test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + result++; + } + return result; +} + Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/mercator_erectTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/mercator_erectTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/mercator_erectTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -374,14 +374,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -392,6 +392,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.726646, 5.240829); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575959, 0.575959); + result += Custom(300.14, -222.0, 5.238431, -3.875601); + result += Custom(0.0, 77.14, 0.0, 1.346388); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.472930, 4.478266); + result += Custom(91.14, -0.0, 1.590693 , 0.0); + result += Custom(-333.0, 31.14, -5.811946, 0.543498); + result += Custom(-100.2, -100.2, -1.748820 , -1.748909); return result; } Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/pano_erectTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/pano_erectTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/pano_erectTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -233,14 +233,14 @@ { printf("Current (x) deg = %d, rad = %lf\n", x, x_dest); printf("Current (y) deg = %d, rad = %lf\n", y, y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src2, x_src); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src2, x_src); result++; } if( fabs(y_src2 - y_src) > CMP_VALUE ) //testing if y is the same { printf("Current (x) deg = %d, rad = %lf\n", x, x_dest); printf("Current (y) deg = %d, rad = %lf\n", y, y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src2, y_src); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src2, y_src); result++; } } @@ -376,14 +376,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -394,6 +394,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.726646 , 5.243228); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575959, 0.575959); + result += Custom(300.14, -222.0, 5.238431 , -3.876571); + result += Custom(0.0, 77.14, 0.0, 1.346428); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.472930, 4.479763); + result += Custom(91.14, -0.0, 1.590693, 0.0); + result += Custom(-333.0, 31.14, -5.811946, 0.543501); + result += Custom(-100.2, -100.2, -1.748820, -1.748998); return result; } Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/pano_sphere_tpTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/pano_sphere_tpTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/pano_sphere_tpTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -375,14 +375,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -393,6 +393,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.734625 , 5.236556); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575959, 0.575959); + result += Custom(300.14, -222.0, 5.241053 , -3.874796); + result += Custom(0.0, 77.14, 0.0, 1.346428); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.475919, 4.478266); + result += Custom(91.14, -0.0, 1.590693, 0.0); + result += Custom(-333.0, 31.14, -5.812004, 0.543195); + result += Custom(-100.2, -100.2, -1.748998, -1.748909); return result; } Added: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/queryFOVLimitsTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/queryFOVLimitsTest.c (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/queryFOVLimitsTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -0,0 +1,149 @@ +/* + * queryFOVLimitsTest.c + * + * Tests queryFOVLimits, panoProjectionFeaturesQuery and panoProjectionFormatCount. + * + * August 2010 + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Tomasz Meger + * + */ + +#include "filter.h" +#include <stdio.h> + +#define DEBUG_TEST 1 +#define CMP_VALUE 1E-3 + +int runTest(); + +int main(int argc, char *argv[]) +{ + int testsFailed = 0; + +#if DEBUG_TEST + printf("RECTILINEAR FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_RECTILINEAR, 179.0, 179.0);//0 +#if DEBUG_TEST + printf("PANORAMA FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_PANORAMA, 360.0, 179.0);//1 +#if DEBUG_TEST + printf("EQUIRECTANGULAR FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_EQUIRECTANGULAR, 360.0, 180.0);//2 +#if DEBUG_TEST + printf("FISHEYE_FF FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_FISHEYE_FF, 360.0, 360.0);//3 +#if DEBUG_TEST + printf("STEREOGRAPHIC FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_STEREOGRAPHIC, 359.0, 359.0);//4 +#if DEBUG_TEST + printf("MERCATOR FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_MERCATOR , 360.0, 179.0);//5 +#if DEBUG_TEST + printf("TRANS_MERCATOR FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_TRANS_MERCATOR, 179.0, 360.0);//6 +#if DEBUG_TEST + printf("SINUSOIDAL FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_SINUSOIDAL, 360.0, 180.0);//7 +#if DEBUG_TEST + printf("RLAMBERT_EQUAL_AREA_CONIC FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_LAMBERT_EQUAL_AREA_CONIC, 360.0, 180.0);//8 +#if DEBUG_TEST + printf("LAMBERT_AZIMUTHAL FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_LAMBERT_AZIMUTHAL, 360.0, 180.0);//9 +#if DEBUG_TEST + printf("ALBERS_EQUAL_AREA_CONIC FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_ALBERS_EQUAL_AREA_CONIC, 360.0, 180.0);//10 +#if DEBUG_TEST + printf("MILLER_CYLINDRICAL FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_MILLER_CYLINDRICAL, 360.0, 180.0);//11 +#if DEBUG_TEST + printf("PANINI FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_PANINI, 359.0, 179.0);//12 +#if DEBUG_TEST + printf("ARCHITECTURAL FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_ARCHITECTURAL, 360.0, 180.0);//13 +#if DEBUG_TEST + printf("ORTHOGRAPHIC FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_ORTHOGRAPHIC, 180.0, 180.0);//14 +#if DEBUG_TEST + printf("EQUISOLID FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_EQUISOLID, 360.0, 360.0);//15 +#if DEBUG_TEST + printf("EQUI_PANINI FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_EQUI_PANINI, 359.0, 179.0);//16 +#if DEBUG_TEST + printf("BIPLANE FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_BIPLANE, 279.0, 179.0);//17 +#if DEBUG_TEST + printf("TRIPLANE FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_TRIPLANE, 379.0, 179.0);//18 +#if DEBUG_TEST + printf("PANINI_GENERAL FORMAT\n"); +#endif + testsFailed += runTest(PANO_FORMAT_PANINI_GENERAL, 319.913544, 160.0);//19 + + if( panoProjectionFormatCount() != 20) + { + printf("panoProjectionFormatCount() gives wrong number of projections or it is changed\n"); + testsFailed ++; + } + + printf("Number of tests that failed: %d\n", testsFailed); + return 0; +} + +int runTest(int projection, double ref1, double ref2) +{ + double lims[2]; + double para = 100.0; + if(!queryFOVLimits(projection, ¶, lims)) + { + printf("Problem with panoProjectionFeaturesQuery function (returned 0)\n"); + return 1; + } +#if DEBUG_TEST + printf("Maxhfov:%lf Maxvfov:%lf\n", lims[0], lims[1]); +#endif + if( abs(lims[0] - ref1) > CMP_VALUE || abs(lims[1] - ref2) > CMP_VALUE ) + { + printf("Comparing to reference failed for projection:%d\n", projection); + printf("Result:%lf and %lf should be %lf and %lf\n",lims[0],lims[1],ref1,ref2); + return 1; + } + return 0; +} + Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/rect_erectTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/rect_erectTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/rect_erectTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -376,14 +376,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -394,6 +394,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.748866 , 5.263256); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575975, 0.575975); + result += Custom(300.14, -222.0, 5.243228 , -3.881896); + result += Custom(0.0, 77.14, 0.0, 1.346428); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.475919, 4.484248); + result += Custom(91.14, -0.0, 1.590827, 0.0); + result += Custom(-333.0, 31.14, -5.818499, 0.544420); + result += Custom(-100.2, -100.2, -1.748998, -1.749266); return result; } Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/rect_sphere_tpTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/rect_sphere_tpTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/rect_sphere_tpTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -375,14 +375,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -393,6 +393,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.756906 , 5.256596); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575975, 0.575975); + result += Custom(300.14, -222.0, 5.245857 , -3.880123); + result += Custom(0.0, 77.14, 0.0, 1.346428); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.478911, 4.482755); + result += Custom(91.14, -0.0, 1.590827, 0.0); + result += Custom(-333.0, 31.14, -5.818557, 0.544114); + result += Custom(-100.2, -100.2, -1.749177, -1.749177); return result; } Added: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/resizeTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/resizeTest.c (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/resizeTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -0,0 +1,92 @@ +/* + * resizeTest.c + * + * Tests resize function. + * + * August 2010 + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Tomasz Meger + * + */ + +#include "filter.h" +#include <stdio.h> + +#define DEBUG_TEST 0 +#define CMP_VALUE 1E-5 +#define FUNCTION resize + +int Custom(double x_dest, double y_dest, double x_ref, double y_ref, double scale_horizontal, double scale_vertical); + +int main(int argc, char *argv[]) +{ + int testsFailed = 0; + + //just some simple test cases + testsFailed += Custom(0.5, 0.5, 0.5, 0.5, 1, 1); + testsFailed += Custom(3.14, -3.14, 1.57, -1.57, 0.5, 0.5); + testsFailed += Custom(-0.5, -0.5, 0.5, -0.5, -1, 1); + testsFailed += Custom(0.0, 0.0, 0.0, 0.0, 12354.1, 999999999999.5); + testsFailed += Custom(-1.0, -0.0, -1.0, 0.0, 1, 321.123); + testsFailed += Custom(555.5, 555.5, 6110.5, 7221.50, 11, 13); + testsFailed += Custom(-678.5, -0.5, 339.25, 0.75, -0.5, -1.5); + testsFailed += Custom(987.1, -64.1, -987.10, 128.2, -1.0, -2.0); + testsFailed += Custom(3214.111, -1.1467, 321089.6889, 114.55533, 99.9, -99.9); + testsFailed += Custom(632, 0.01, -70.9736, -0.001, -0.1123, -0.1); + testsFailed += Custom(6.123456789, 0.11111, 6.123457, -0.11111, 1, -1); + testsFailed += Custom(12345678, 0.0001, -12345678.0, 0.00001, -1, 0.1); + + + printf("Number of tests that failed: %d\n", testsFailed); + return 0; +} + +int Custom(double x_dest, double y_dest, double x_ref, double y_ref, double scale_horizontal, double scale_vertical) +{ + double x_src; + double y_src; + double tmp[2]; + int result = 0; + + tmp[0] = scale_horizontal; + tmp[1] = scale_vertical; + +#if DEBUG_TEST + printf("Rad x_dest = %lf, y_dest = %lf\n", x_dest, y_dest); +#endif + FUNCTION(x_dest, y_dest, &x_src, &y_src, tmp); +#if DEBUG_TEST + printf("%lf %lf\n", x_src, y_src); +#endif + + if( fabs(x_src - x_ref) > CMP_VALUE ) //testing if x is the same + { + printf("Current (x) = %lf\n", x_dest); + printf("Current (y) = %lf\n", y_dest); + printf("Test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + result++; + } + if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same + { + printf("Current (x) = %lf\n", x_dest); + printf("Current (y) = %lf\n", y_dest); + printf("Test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + result++; + } + return result; +} + Added: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/rotate_erectTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/rotate_erectTest.c (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/rotate_erectTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -0,0 +1,92 @@ +/* + * rotate_erectTest.c + * + * Tests rotate_erect function. + * + * August 2010 + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Tomasz Meger + * + */ + +#include "filter.h" +#include <stdio.h> + +#define DEBUG_TEST 0 +#define CMP_VALUE 1E-5 +#define FUNCTION rotate_erect + +int Custom(double x_dest, double y_dest, double x_ref, double y_ref, double degree_turn180, double turn); + +int main(int argc, char *argv[]) +{ + int testsFailed = 0; + + //just some simple test cases + testsFailed += Custom(0.5, 0.5, -0.5, 0.5, 1, 1); + testsFailed += Custom(3.14, -3.14, -0.360000, -3.140000, 0.5, 0.5); + testsFailed += Custom(-0.5, -0.5, 0.500000, -0.500000, 1, 1); + testsFailed += Custom(0.0, 0.0, -5430.973555, 0.000000, 12354.1, 999999999999.5); + testsFailed += Custom(-1.0, -0.0, 0.123000, -0.000000, 1, 321.123); + testsFailed += Custom(555.5, 555.5, -3.500000, 555.500000, 11, 13); + testsFailed += Custom(-678.5, -0.5, 0.000000, -0.500000, 0.5, 1.5); + testsFailed += Custom(987.1, -64.1, -0.900000, -64.100000, 1.0, 2.0); + testsFailed += Custom(3214.111, -1.1467, -82.589000, -1.146700, 99.9, 99.9); + testsFailed += Custom(632, 0.01, 0.075600, 0.010000, 0.1123, 0.1); + testsFailed += Custom(6.123456789, 0.11111, -0.876543, 0.111110, 1, 1); + testsFailed += Custom(12345678, 0.0001, 0.100000, 0.000100, 1, 0.1); + + + printf("Number of tests that failed: %d\n", testsFailed); + return 0; +} + +int Custom(double x_dest, double y_dest, double x_ref, double y_ref, double degree_turn180, double turn) +{ + double x_src; + double y_src; + double tmp[2]; + int result = 0; + + tmp[0] = degree_turn180; + tmp[1] = turn; + +#if DEBUG_TEST + printf("x_dest = %lf, y_dest = %lf\n", x_dest, y_dest); +#endif + FUNCTION(x_dest, y_dest, &x_src, &y_src, tmp); +#if DEBUG_TEST + printf("%lf, %lf\n", x_src, y_src); +#endif + + if( fabs(x_src - x_ref) > CMP_VALUE ) //testing if x is the same + { + printf("Current (x) = %lf\n", x_dest); + printf("Current (y) = %lf\n", y_dest); + printf("Test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + result++; + } + if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same + { + printf("Current (x) = %lf\n", x_dest); + printf("Current (y) = %lf\n", y_dest); + printf("Test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + result++; + } + return result; +} + Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/sinusoidal_erectTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/sinusoidal_erectTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/sinusoidal_erectTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -377,14 +377,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -395,6 +395,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.714676 , 5.238431); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575949, 0.575959); + result += Custom(300.14, -222.0, 5.234500 , -3.874631); + result += Custom(0.0, 77.14, 0.0, 1.346347); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.468448, 4.476770); + result += Custom(91.14, -0.0, 1.590693, 0.0); + result += Custom(-333.0, 31.14, -5.811861, 0.543496); + result += Custom(-100.2, -100.2, -1.748552, -1.748820); return result; } Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/sphere_tp_erectTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/sphere_tp_erectTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/sphere_tp_erectTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -374,14 +374,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -392,6 +392,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.718654 , 5.245081); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575949, 0.575959); + result += Custom(300.14, -222.0, 5.235809 , -3.876403); + result += Custom(0.0, 77.14, 0.0, 1.346347); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.469940, 4.478262); + result += Custom(91.14, -0.0, 1.590693, 0.0); + result += Custom(-333.0, 31.14, -5.811889, 0.543802); + result += Custom(-100.2, -100.2, -1.748642, -1.748909); return result; } Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/sphere_tp_panoTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/sphere_tp_panoTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/sphere_tp_panoTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -374,14 +374,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -392,6 +392,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.718669 , 5.240291); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575949, 0.575959); + result += Custom(300.14, -222.0, 5.235809 , -3.874465); + result += Custom(0.0, 77.14, 0.0, 1.346266); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.469940, 4.475274); + result += Custom(91.14, -0.0, 1.590693, 0.0); + result += Custom(-333.0, 31.14, -5.811889, 0.543802); + result += Custom(-100.2, -100.2, -1.748642, -1.748731); return result; } Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/sphere_tp_rectTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/sphere_tp_rectTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/sphere_tp_rectTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -375,14 +375,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -393,6 +393,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.696697 , 5.220454); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575949, 0.575946); + result += Custom(300.14, -222.0, 5.231037 , -3.869162); + result += Custom(0.0, 77.14, 0.0, 1.346266); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.466973, 4.470808); + result += Custom(91.14, -0.0, 1.590559, 0.0); + result += Custom(-333.0, 31.14, -5.805359, 0.542879); + result += Custom(-100.2, -100.2, -1.748463, -1.748463); return result; } Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/stereographic_erectTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/stereographic_erectTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/stereographic_erectTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -376,14 +376,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -394,6 +394,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.726184 , 5.249611); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575949, 0.575965); + result += Custom(300.14, -222.0, 5.237661 , -3.877774); + result += Custom(0.0, 77.14, 0.0, 1.346367); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.471432, 4.479757); + result += Custom(91.14, -0.0, 1.590727, 0.0); + result += Custom(-333.0, 31.14, -5.813540, 0.543956); + result += Custom(-100.2, -100.2, -1.748731, -1.748998); return result; } Modified: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/transmercator_erectTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/transmercator_erectTest.c 2010-08-13 06:54:51 UTC (rev 1293) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/transmercator_erectTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -376,14 +376,14 @@ { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + printf("Custom test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); result++; } if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same { printf("Current (x) rad = %lf\n", x_dest); printf("Current (y) rad = %lf\n", y_dest); - printf("IFMethod test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + printf("Custom test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); result++; } #undef CMP_VALUE @@ -394,6 +394,17 @@ { int result = 0; result += Custom(1.0, 0.0, 0.017453, 0.0); + result += Custom(3.14, -5.0, 0.054803, -0.087266); + result += Custom(-500.0, 300.14, -8.725697 , 5.258404); + result += Custom(-10.0, -10.0, -0.174533, -0.174533); + result += Custom(33.0, 33.0, 0.575949, 0.575965); + result += Custom(300.14, -222.0, 5.236888 , -3.879948); + result += Custom(0.0, 77.14, 0.0, 1.346347); + result += Custom(0.0, 0.0, 0.0, 0.0); + result += Custom(256.28, 256.5, 4.469933, 4.481246); + result += Custom(91.14, -0.0, 1.590760, 0.0); + result += Custom(-333.0, 31.14, -5.815135, 0.544415); + result += Custom(-100.2, -100.2, -1.748642, -1.749087); return result; } Added: branches/libpano_gsoc2010_regtests/tests/gsoc/functions/vertTest.c =================================================================== --- branches/libpano_gsoc2010_regtests/tests/gsoc/functions/vertTest.c (rev 0) +++ branches/libpano_gsoc2010_regtests/tests/gsoc/functions/vertTest.c 2010-08-16 14:33:30 UTC (rev 1294) @@ -0,0 +1,76 @@ +/* + * vertTest.c + * + * Tests vert function. + * + * August 2010 + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Tomasz Meger + * + */ + +#include "filter.h" +#include <stdio.h> + +#define DEBUG_TEST 0 +#define CMP_VALUE 1E-5 +#define FUNCTION vert + +int Custom(double x_dest, double y_dest, double x_ref, double y_ref, double vshift); + +int main(int argc, char *argv[]) +{ + int testsFailed = 0; + + //just some simple test cases + testsFailed += Custom(0.5, 0.5, 0.5, 1.0, 0.5); + testsFailed += Custom(0.5, 0.5, 0.5, 16.0, 15.5); + testsFailed += Custom(-0.5, -0.5, -0.5, -1.0, -0.5); + testsFailed += Custom(0.1, -0.1, 0.1, -0.6, -0.5); + testsFailed += Custom(0.5, 0.1, 0.5, 0.6, 0.5); + testsFailed += Custom(0.0, 0.0, 0.0, 0.0, -0.0); + testsFailed += Custom(8.5, 12345888.987653, 8.5, 13456999.487653, 1111110.5); + + printf("Number of tests that failed: %d\n", testsFailed); + return 0; +} + +int Custom(double x_dest, double y_dest, double x_ref, double y_ref, double vshift) +{ + double x_src; + double y_src; + int result = 0; + + FUNCTION(x_dest, y_dest, &x_src, &y_src, &vshift); + + if( fabs(x_dest - x_ref) > CMP_VALUE ) //testing if x is the same + { + printf("Current (x) = %lf\n", x_dest); + printf("Current (y) = %lf\n", y_dest); + printf("Test failed: x_src = %lf should be x_src = %lf\n", x_src, x_ref); + result++; + } + if( fabs(y_src - y_ref) > CMP_VALUE ) //testing if y is the same + { + printf("Current (x) = %lf\n", x_dest); + printf("Current (y) = %lf\n", y_dest); + printf("Test failed: y_src = %lf should be y_src = %lf\n", y_src, y_ref); + result++; + } + return result; +} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |