Great. Thank you Gary and Alex for helping to sort out this issue so
quickly! I'll try to release version 1.2.9 tomorrow. If you could
Alex, there's one more test I'll describe below which would be useful.
As for the updating issue, this is known as a conflict. They usually
occur when the code you are modifying is modified in the repository by
someone else. In this case however, you are essentially applying the
change twice to the same piece of code (hence subversion freaked out).
These are pretty easy to fix up though. First type 'svn st' to see
the status of your code (typing 'scons clean' first will make you life
easier). You'll see a number of additional files which are all the
different versions of the conflicting file (yours, the repositories,
etc.). Then you modify the file to resolve the conflict by removing
the '>>>>>>> ', '=======', '<<<<<<<' lines and making sure that the
code in the middle is correctly merged. The final thing is to tell
subversion that the issue is resolved. In this case you type 'svn
resolved float.py'. Then type 'svn st' to see the status.
If the final status ('svn st') has a big 'M' infront of 'float.py',
then the code will not be exactly what is in the repository. If you
type 'svn revert float.py' followed by 'svn up', you'll have the
correct copy of the code. The 'svn revert' command will undo all your
changes. Alex, would you be able to, after fixing up your code, rerun
the test and see if it still works?
Thanks,
Edward
On 11/9/06, Alexandar Hansen <viochemist@xxxxxxxxx> wrote:
I copy-pasted Gary's code yesterday and it worked fine. One word of warning
(and probably everyone already knows this) but when I svn up-ed to check the
real code, it surrounded the code I copied to float.py with:
>>>>>>> .mine
[the copied code]
=============
then it placed the new code, containing the line:
>>>>>>> .r2774
Without deleting these lines, I get a "Invalid syntax" errors. Once I
deleted them all, it worked fine.
Alex
On 11/8/06, Edward d'Auvergne <edward.dauvergne@xxxxxxxxx> wrote:
>
> Thank you Gary for the quick response and fix to bug #7641
> (http://gna.org/bugs/?7641). Alex, now that Gary has ported the fix
> from the 1.2 line into 1.3 line (as well as the 'test_suite' branch),
> would you be able to confirm that the bug has been resolved? There
> should no longer be a RelaxError about an infinite chi-squared value
> on your data when running the 1.3 line repository code. Once
> confirmed, I'll release relax 1.2.9.
>
> Thanks,
>
> Edward
>
>
>
> On 11/8/06, garyt@xxxxxxxxxxxxxxx <garyt@xxxxxxxxxxxxxxx> wrote:
> > Author: varioustoxins
> > Date: Wed Nov 8 00:17:53 2006
> > New Revision: 2768
> >
> > URL: http://svn.gna.org/viewcvs/relax?rev=2768&view=rev
> > Log:
> > fixed bug 7641 Infinite Chi2 warning
> >
> > bug #7641 http://gna.org/bugs/?7641
> >
https://mail.gna.org/public/relax-devel/2006-11/msg00078.html
> >
> > Modified:
> > 1.2/float.py
> >
> > Modified: 1.2/float.py
> > URL:
http://svn.gna.org/viewcvs/relax/1.2/float.py?rev=2768&r1=2767&r2=2768&view=diff
> >
==============================================================================
> > --- 1.2/float.py (original)
> > +++ 1.2/float.py Wed Nov 8 00:17:53 2006
> > @@ -154,7 +154,7 @@
> > if isFinite(float):
> > # check and store is positive
> > positive = isPositive(float)
> > - if isZero():
> > + if isZero(float):
> > if positive:
> > result = CLASS_POS_ZERO
> > else:
> > @@ -178,7 +178,7 @@
> > result = CLASS_POS_INF
> > elif isNegInf(float):
> > result = CLASS_NEG_INF
> > -
> > + return result
> >
> >
> > def packBytesAsPyFloat(bytes):
> > @@ -612,16 +612,19 @@
> > # if exponent is not all ones this can't be a Inf
> > if not isExpAllOnes(obj):
> > result = False
> > -
> > - # get the mantissa as a byte array properly masked
> > - manBytes = getMantissaBytes(obj)
> > -
> > - for byte in manBytes:
> > - #check if any of the unmasked mantissa bytes are zero
> > - # to be a NaN the mantissa must be zero
> > - if byte > 0:
> > - return False
> > - return True
> > + else:
> > + # get the mantissa as a byte array properly masked
> > + manBytes = getMantissaBytes(obj)
> > +
> > + for byte in manBytes:
> > + #check if any of the unmasked mantissa bytes are zero
> > + # to be a NaN the mantissa must be zero
> > + if byte > 0:
> > + result = False
> > + break
> > + result = True
> > +
> > + return result
> >
> > def isPosInf(obj):
> > ''' check to see if a python float is positive infinity
> >
> >
> > _______________________________________________
> > relax (http://nmr-relax.com)
> >
> > This is the relax-commits mailing list
> > relax-commits@xxxxxxx
> >
> > To unsubscribe from this list, get a password
> > reminder, or change your subscription options,
> > visit the list information page at
> > https://mail.gna.org/listinfo/relax-commits
> >
>
> _______________________________________________
> relax (http://nmr-relax.com)
>
> This is the relax-devel mailing list
> relax-devel@xxxxxxx
>
> To unsubscribe from this list, get a password
> reminder, or change your subscription options,
> visit the list information page at
> https://mail.gna.org/listinfo/relax-devel
>
Re: r2768 - /1.2/float.py