From 072cf3d81487379b234509d3c82429882966df33 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Mon, 25 May 2015 08:40:43 +0200
Subject: [PATCH] + new test: J selections, with all kind of list
specifications * msx: allow for mixed input with / without error bar
---
pub/lib/manip.cpp | 8 +++++++-
pub/test/jsel.f2t | 18 ++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
create mode 100755 pub/test/jsel.f2t
diff --git a/pub/lib/manip.cpp b/pub/lib/manip.cpp
index ce9fb97c..14d18c6d 100644
--- a/pub/lib/manip.cpp
+++ b/pub/lib/manip.cpp
@@ -665,9 +665,15 @@ void NManip::exchange_x_z()
sout->z.push_back( PObjDbl( new CObjDbl(z) ) );
sout->z.push_back( PObjDbl( new CObjDbl(xcommon[i]) ) );
+ bool with_dy = true;
+ for ( int j=ji; j<jf; ++j ) {
+ if ( !( fin->VS(j)->dy.size() ) ) {
+ with_dy = false;
+ break;
+ }
+ }
for ( int j=ji; j<jf; ++j ) {
PSpec sin = fin->VS( j );
- bool with_dy = sin->dy.size();
if ( sin->x[ii]!=xcommon[i] ) { // guess failed
for (ii=0; ii<sin->size(); ++ii)
if ( sin->x[ii]==xcommon[i] )
diff --git a/pub/test/jsel.f2t b/pub/test/jsel.f2t
new file mode 100755
index 00000000..615bd889
--- /dev/null
+++ b/pub/test/jsel.f2t
@@ -0,0 +1,18 @@
+#!/usr/bin/env frida
+fm 1000 1 h
+throw_unless(ni==1000,"mpr_failed")
+mpr 0:899
+throw_unless(ni==900,"mpr_failed")
+mpr 50:
+throw_unless(ni==850,"mpr_failed")
+mpr :799
+throw_unless(ni==800,"mpr_failed")
+mpr ::4
+throw_unless(ni==200,"mpr_failed")
+mpd ::4
+throw_unless(ni==150,"mpr_failed")
+mpr 0:119:3
+throw_unless(ni==40,"mpr_failed")
+mpd 0:39:4
+throw_unless(ni==30,"mpr_failed")
+exit(1)
\ No newline at end of file
--
GitLab