Re: r22269 - /trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py -- February 24, 2014 - 11:16

Hi,

I was wondering what had happened.  For branching, it is normally best
to create a branch in the centralised svn repository so that the
commit messages are stored there.  That way I use 'svn log > log' in
the branch to obtain all the messages, and then convert these for the
release messages.  For git-svn, the normal git branching should not be
used as it is not compatible with svn branching.  From
http://git-scm.com/book/en/Git-and-Other-Systems-Git-and-Subversion:

"It's important to note that when you're using git svn, you're
interacting with Subversion, which is a system that is far less
sophisticated than Git. Although you can easily do local branching and
merging, it's generally best to keep your history as linear as
possible by rebasing your work and avoiding doing things like
simultaneously interacting with a Git remote repository."

The linear history should make sure that commit messages are all
pushed to the central svn repository.  By creating a svn branch, this
can be checked out and treated like a separate repository with git-svn
and worked on in a linear fashion.  Anyway, this change is so small
though that isn't not an issue.  For reverting, don't worry about it
this time.  I will see " Merge branch 'bug'" in the release messages
and then know to come to this mail to obtain the correct messages.

Cheers,

Edward

On 24 February 2014 11:03, Troels Emtekær Linnet <tlinnet@xxxxxxxxxxxxx> 
wrote:
> Hi Edward.
>
> Sorry, I am not careful enough when committing to the SVN repository.
>
> The last commit should have had these two commit messages:
> --------
> Author: Troels E. Linnet <tlinnet@xxxxxxxxxxxxx>
> Date:   Mon Feb 24 10:57:57 2014 +0100
>
>     Added unit test for looping over: exp frq offset point.
>
>     Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a
> CPMG analysis with two fields at two delay times.
>
>     This follows recommendation in thread:
> http://thread.gmane.org/gmane.science.nmr.relax.devel/5070.
> -------------
> Author: Troels E. Linnet <tlinnet@xxxxxxxxxxxxx>
> Date:   Mon Feb 24 10:57:57 2014 +0100
>
>     Added unit test for looping over: exp frq offset point.
>
>     Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a
> CPMG analysis with two fields at two delay times.
>
>     This follows recommendation in thread:
> http://thread.gmane.org/gmane.science.nmr.relax.devel/5070.
> --------------------
>
> Should I revert the commit and add these commit messages?
>
> Sorry again.
>
> Best
> Troels
>
> ---------- Forwarded message ----------
> From:  <tlinnet@xxxxxxxxxxxxx>
> Date: 2014-02-24 10:59 GMT+01:00
> Subject: r22269 -
> /trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py
> To: relax-commits@xxxxxxx
>
>
> Author: tlinnet
> Date: Mon Feb 24 10:59:16 2014
> New Revision: 22269
>
> URL: http://svn.gna.org/viewcvs/relax?rev=22269&view=rev
> Log:
> Merge branch 'bug'
>
> Modified:
>     
> trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py
>
> Modified: 
> trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py
> URL: 
> http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py?rev=22269&r1=22268&r2=22269&view=diff
> ==============================================================================
> --- 
> trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py
> (original)
> +++ 
> trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py
> Mon Feb 24 10:59:16 2014
> @@ -25,7 +25,7 @@
>  # relax module imports.
>  from data_store import Relax_data_store; ds = Relax_data_store()
>  from pipe_control import state
> -from specific_analyses.relax_disp.disp_data import loop_exp_frq,
> loop_exp_frq_offset_point_time
> +from specific_analyses.relax_disp.disp_data import loop_exp_frq,
> loop_exp_frq_offset, loop_exp_frq_offset_point,
> loop_exp_frq_offset_point_time
>  from status import Status; status = Status()
>  from test_suite.unit_tests.base_classes import UnitTestCase
>
> @@ -84,6 +84,115 @@
>
>              # Increment the data index.
>              index += 1
> +
> +
> +    def test_loop_exp_frq_offset(self):
> +        """Unit test of the loop_exp_frq_offset() function.
> +
> +        This uses the data of the saved state attached to U{bug
> #21665<https://gna.org/bugs/?21665>}.
> +        """
> +
> +        # Load the state.
> +        statefile = status.install_path +
> sep+'test_suite'+sep+'shared_data'+sep+'dispersion'+sep+'bug_21665.bz2'
> +        state.load_state(statefile, force=True)
> +
> +        # Original data (exp_type, frq, offset).
> +        data = [
> +            ['SQ CPMG', 499862140.0, 0],
> +            ['SQ CPMG', 599890858.69999993, 0]
> +        ]
> +
> +        # Original indices (ei, mi, oi).
> +        indices = [
> +            [0, 0, 0],
> +            [0, 1, 0]
> +        ]
> +
> +        # Check the number of iterations.
> +        print("Checking the number of iterations of the loop.")
> +        count = 0
> +        for exp_type, frq, offset, ei, mi, oi in
> loop_exp_frq_offset(return_indices=True):
> +            print exp_type, frq, offset, ei, mi, oi
> +            count += 1
> +        self.assertEqual(count, 2)
> +
> +        # Check the values.
> +        print("Checking the values returned by the loop.")
> +        index = 0
> +        for exp_type, frq, offset, ei, mi, oi in
> loop_exp_frq_offset(return_indices=True):
> +            # Check the experiment info.
> +            self.assertEqual(exp_type, data[index][0])
> +            self.assertEqual(ei, indices[index][0])
> +
> +            # Check the frequency info.
> +            self.assertEqual(frq, data[index][1])
> +            self.assertEqual(mi, indices[index][1])
> +
> +            # Check the offset info.
> +            self.assertEqual(offset, data[index][2])
> +            self.assertEqual(oi, indices[index][2])
> +
> +            # Increment the data index.
> +            index += 1
> +
> +
> +    def test_loop_exp_frq_offset_point(self):
> +        """Unit test of the loop_exp_frq_offset_point() function.
> +
> +        This uses the data of the saved state attached to U{bug
> #21665<https://gna.org/bugs/?21665>}.
> +        """
> +
> +        # Load the state.
> +        statefile = status.install_path +
> sep+'test_suite'+sep+'shared_data'+sep+'dispersion'+sep+'bug_21665.bz2'
> +        state.load_state(statefile, force=True)
> +
> +        # Original data (exp_type, frq, offset, point).
> +        data = [
> +            ['SQ CPMG', 499862140.0, 0, [50.0, 100.0, 150.0, 200.0,
> 250.0, 300.0, 350.0, 400.0, 450.0, 500.0, 550.0, 600.0, 650.0, 700.0,
> 800.0, 900.0, 1000.0]],
> +            ['SQ CPMG', 599890858.69999993, 0, [33.3333, 66.666,
> 100.0, 133.333, 166.666, 200.0, 233.333, 266.666, 300.0, 333.333,
> 366.666, 400.0, 466.666, 533.333, 666.666, 866.666, 1000.0]]
> +        ]
> +
> +        # Original indices (ei, mi, oi).
> +        indices = [
> +            [0, 0, 0, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
> 14, 15, 16]],
> +            [0, 1, 0, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
> 14, 15, 16]]
> +        ]
> +
> +        # Check the number of iterations.
> +        print("Checking the number of iterations of the loop.")
> +        count = 0
> +        for exp_type, frq, offset, point, ei, mi, oi, di in
> loop_exp_frq_offset_point(return_indices=True):
> +            print exp_type, frq, offset, point, ei, mi, oi, di
> +            count += 1
> +        self.assertEqual(count, 34)
> +
> +        # Check the values.
> +        print("Checking the values returned by the loop.")
> +        frq_index = 0
> +        disp_index = 0
> +        for exp_type, frq, offset, point, ei, mi, oi, di in
> loop_exp_frq_offset_point(return_indices=True):
> +            # Check the experiment info.
> +            self.assertEqual(exp_type, data[frq_index][0])
> +            self.assertEqual(ei, indices[frq_index][0])
> +
> +            # Check the frequency info.
> +            self.assertEqual(frq, data[frq_index][1])
> +            self.assertEqual(mi, indices[frq_index][1])
> +
> +            # Check the offset info.
> +            self.assertEqual(offset, data[frq_index][2])
> +            self.assertEqual(oi, indices[frq_index][2])
> +
> +            # Check the dispersion point info.
> +            self.assertAlmostEqual(point, data[frq_index][3][disp_index],2)
> +            self.assertEqual(di, indices[frq_index][3][disp_index])
> +
> +            # Increment the data index.
> +            if disp_index == 16:
> +                frq_index += 1
> +                disp_index = 0
> +            else:
> +                disp_index += 1
>
>
>      def test_loop_exp_frq_offset_point_time(self):
>
>
> _______________________________________________
> relax (http://www.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://www.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