Merge branch 'master' of github.com:Normaliz/PyNormaliz

# Conflicts:
#	README.md

Author: w-bruns

NormalizModule.cpp

@@ -237,7 +237,7 @@ static bool PyNumberToNmz(PyObject*, mpz_class&);
 static bool PyNumberToNmz(PyObject* in, mpq_class& out)
 {
     if (PyFloat_Check(in)) {
-        throw PyNormalizInputException("PyFloat not allowed in PyNormaliz input. Must be ecoded as string.");
+        throw PyNormalizInputException("PyFloat not allowed in PyNormaliz input. Must be encoded as string.");
         return true;
     }
 #if PY_MAJOR_VERSION < 3
@@ -1695,7 +1695,7 @@ properties are available. Here are some special outputs that might differ from
 Normaliz:
 * HilbertSeries and WeightedEhrhartSeries
   The returned object is a list with three entries: The first one describes
-the numerator of the hilbert series, the second one the denominator, and the
+the numerator of the Hilbert series, the second one the denominator, and the
 last one is the shift. If you pass the HSOP option, output will be done in
 HSOP format.
 * Grading
@@ -1768,7 +1768,7 @@ _NmzResultImpl(Cone< Integer >* C, PyObject* prop_obj, const void* nf = nullptr)
             return NmzWeightedEhrhartSeriesToPyList( C->getWeightedEhrhartSeries());
 
         // though Grading has the return type vector<Integer> we make it
-        // a complex struture within PyNormaliz since we want to combine it
+        // a complex structure within PyNormaliz since we want to combine it
         // with the grading denominator
         case libnormaliz::ConeProperty::Grading: {
             vector< Integer > grad = C->getGrading();
@@ -2163,7 +2163,7 @@ static PyObject* NmzSetPolynomial(PyObject* self, PyObject* args)
     PyObject* poly_pi = PyTuple_GetItem(args, 1);
 
     if(!string_check(poly_pi)){
-        PyErr_SetString(PyNormaliz_cppError, "Polynomual must be given as a string");
+        PyErr_SetString(PyNormaliz_cppError, "Polynomial must be given as a string");
         return NULL;
     }
     TempSignalHandler tmpHandler1; // use custom signal handler
@@ -2215,7 +2215,7 @@ static PyObject* NmzSetPolynomialEquations(PyObject* self, PyObject* args)
     vector<string> PolyEquations;
     for(size_t i = 0; i < nr_polys; ++i){
         if(!string_check(PyList_GetItem(polys_py,i))) {
-            PyErr_SetString(PyNormaliz_cppError, "Polynomual must be given as a string");
+            PyErr_SetString(PyNormaliz_cppError, "Polynomial must be given as a string");
             return NULL;
         }
         string equ = PyUnicodeToString( PyList_GetItem(polys_py,i));
@@ -2267,7 +2267,7 @@ static PyObject* NmzSetPolynomialInequalities(PyObject* self, PyObject* args)
     vector<string> PolyInequalities;
     for(size_t i = 0; i < nr_polys; ++i){
         if(!string_check(PyList_GetItem(polys_py,i))) {
-            PyErr_SetString(PyNormaliz_cppError, "Polynomual must be given as a string");
+            PyErr_SetString(PyNormaliz_cppError, "Polynomial must be given as a string");
             return NULL;
         }
         string inequ = PyUnicodeToString( PyList_GetItem(polys_py,i));
@@ -2493,7 +2493,7 @@ static PyObject* NmzSymmetrizedCone(PyObject* self, PyObject* args)
 
 /***************************************************************************
  *
- * Get expanded hilbert series
+ * Get expanded Hilbert series
  *
  ***************************************************************************/
 
@@ -2870,7 +2870,7 @@ static PyObject* NmzFieldGenName(PyObject* self, PyObject* args)
 
 #endif
 
-    return NULL; // to kmake gcc happy
+    return NULL; // to make gcc happy
 
     FUNC_END
 }

PyNormaliz.py

@@ -150,7 +150,7 @@ def our_float_handler(x):
 
 def PrettyPolynomialTuple(numCoefficients, denCoefficients):
     """
-    Strings for numerator and denominator of the a hilbert series.
+    Strings for numerator and denominator of the a Hilbert series.
 
     Parameters
     ----------
@@ -236,7 +236,7 @@ def getDenominator(coefficients):
 
 def PrintPrettyHilbertSeries(numCoefficients, denCoefficients):
     """
-    Make a pretty hilbert series string
+    Make a pretty Hilbert series string
 
     Parameters
     ----------

README.md

@@ -5,17 +5,17 @@
 
 PyNormaliz provides an interface to [Normaliz](https://www.normaliz.uni-osnabrueck.de) via libNormaliz.
 It offers the complete functionality of Normaliz, and can be used interactively from python.
-For a first example, see [this introduction](doc/PyNormaliz_Tutorial.pdf) by Richard Sieg (Slighty outdated: for the installation follow the instructions below).
+For a first example, see [this introduction](doc/PyNormaliz_Tutorial.pdf) by Richard Sieg (Slightly outdated: for the installation follow the instructions below).
 
-A full documentation is conatined in [Appendix E](doc/PyNormaliz.pdf) of the Normaliz manial.
+A full documentation is contained in [Appendix E](doc/PyNormaliz.pdf) of the Normaliz manual.
 
 
 ## Requirements
 
 * python 3.4 or higher
 * Normaliz 3.10.2 or higher <https://github.com/Normaliz/Normaliz/releases>
 
-The source packages of the Normaliz realeases contain PyNormaliz.
+The source packages of the Normaliz releases contain PyNormaliz.
 
 ## Installation
 
@@ -53,7 +53,7 @@ returns what its name says:
 
     [[0, 1], [1, 0]]
 
-is the matrix of the two Hilbert basis vectors. The ouput matrices of PyNormaliz can be used also in Normaliz input files.
+is the matrix of the two Hilbert basis vectors. The output matrices of PyNormaliz can be used also in Normaliz input files.
 
 One can pass options to the compute functions as in
 
@@ -63,7 +63,7 @@ Note that some Normaliz output types must be specially encoded for python. Our H
 
     [[1], [1, 1], 0]
 
-to be read as follows: [1] is the numerator polynomial, [1,1] is the vector of exponents of t that occur in the denominator, which is (1-t)(1-t) in our case, and 0 is the shift.  So the Hilbert series is given by the rational function 1/(1-t)(1-t). (Aoso see ee [this introduction](doc/PyNormaliz_Tutorial.pdf).) But we can use
+to be read as follows: [1] is the numerator polynomial, [1,1] is the vector of exponents of t that occur in the denominator, which is (1-t)(1-t) in our case, and 0 is the shift.  So the Hilbert series is given by the rational function 1/(1-t)(1-t). (Also see [this introduction](doc/PyNormaliz_Tutorial.pdf).) But we can use
 
     print_series(C.HilbertSeries(HSOP = True))
 
@@ -74,7 +74,7 @@ with the result
     (1 - t)^2
 
 
-One can also compute several data simultaneously and specify options ("PrimalMode" only added as an example, not because ot is particularly useful here):
+One can also compute several data simultaneously and specify options ("PrimalMode" only added as an example, not because it is particularly useful here):
 
     C.Compute("LatticePoints", "Volume", "PrimalMode")