Fix -ori

Made simple fix so that orientations do not change when a zero-weight
mode is added to the input distribution (test ori_0).

Author: rquey

VERSIONS

@@ -1,4 +1,4 @@
-New in 4.8.2-3 (13 Feb 2024):
+New in 4.8.2-4 (20 Feb 2024):
 - module -T: added -transform "cut(cube)", improved -transform "cut(cubei)",
   made minor improvements.
 

doc/conf.py

@@ -11,8 +11,8 @@
 import sphinx_rtd_theme
 
 project = u'Neper'
-version = u'4.8.2-3'
-release = u'4.8.2-3'
+version = u'4.8.2-4'
+release = u'4.8.2-4'
 author = u'Romain Quey'
 copyright = u'Romain Quey'
 language = 'en'

src/CMakeLists.txt

@@ -7,7 +7,7 @@ if(POLICY CMP0077)
   cmake_policy(SET CMP0077 NEW)
 endif()
 
-set(NEPER_VERSION \"4.8.2-3\")
+set(NEPER_VERSION \"4.8.2-4\")
 project(neper)
 
 if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8.1)

src/neper_t/net_ori/net_ori1.c

@@ -34,6 +34,7 @@ net_ori (struct IN_T In, int level, struct MTESS MTess, struct TESS *Tess,
   int i, j, partqty, *qty = NULL;
   char **parts = NULL;
   struct OL_SET OSet, *OSets = NULL;
+  int *size = NULL;
 
   net_ori_mtess_params (In, level, MTess, Tess, dtess, dcell, &ori, &orisampling, &orispread, &oricrysym);
 
@@ -44,6 +45,7 @@ net_ori (struct IN_T In, int level, struct MTESS MTess, struct TESS *Tess,
   net_ori_qty (pSSet, parts, partqty, &qty);
 
   OSets = malloc (partqty * sizeof (struct OL_SET));
+  size = ut_alloc_1d_int (partqty);
   for (i = 0; i < partqty; i++)
     OSets[i] = ol_set_alloc (qty[i], oricrysym);
 
@@ -120,9 +122,14 @@ net_ori (struct IN_T In, int level, struct MTESS MTess, struct TESS *Tess,
   }
 
   ol_set_cat (OSets, partqty, &OSet);
+  for (i = 0; i < partqty; i++)
+    size[i] = OSets[i].size;
+
+  printf ("ut_array_1d_int_sum (size, partqty) = %d\n", ut_array_1d_int_sum (size, partqty));
+  printf ("ut_array_1d_int_max (size, partqty) = %d\n", ut_array_1d_int_max (size, partqty));
 
-  if (partqty > 1)
-      ol_set_shuf (&OSet, (*pSSet).Random);
+  if (ut_array_1d_int_sum (size, partqty) > ut_array_1d_int_max (size, partqty))
+    ol_set_shuf (&OSet, (*pSSet).Random);
 
   for (i = 0; i < partqty; i++)
     ol_set_free (OSets + i);
@@ -142,6 +149,7 @@ net_ori (struct IN_T In, int level, struct MTESS MTess, struct TESS *Tess,
   ut_free_1d_char (&orispread);
   ut_free_1d_char (&oricrysym);
   ol_set_free (&OSet);
+  ut_free_1d_int (&size);
 
   return;
 }