diff --git a/amplpy/constraint.pxi b/amplpy/constraint.pxi index f39987b..03a0696 100644 --- a/amplpy/constraint.pxi +++ b/amplpy/constraint.pxi @@ -55,7 +55,7 @@ cdef class Constraint(Entity): """ cdef bool_c value try: - campl.AMPL_ConstraintIsLogical(self._c_ampl, self._name, &value) + PY_AMPL_CALL(campl.AMPL_ConstraintIsLogical(self._c_ampl, self._name, &value)) return value except AttributeError: return False @@ -65,21 +65,21 @@ cdef class Constraint(Entity): Drop all instances in this constraint entity, corresponding to the AMPL code: `drop constraintname;`. """ - campl.AMPL_EntityDrop(self._c_ampl, self._name) + PY_AMPL_CALL(campl.AMPL_EntityDrop(self._c_ampl, self._name)) def restore(self): """ Restore all instances in this constraint entity, corresponding to the AMPL code: `restore constraintname;`. """ - campl.AMPL_EntityRestore(self._c_ampl, self._name) + PY_AMPL_CALL(campl.AMPL_EntityRestore(self._c_ampl, self._name)) def body(self): """ Get the current value of the constraint's body. """ cdef double value - campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_BODY, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_BODY, &value)) return value def astatus(self): @@ -98,7 +98,7 @@ cdef class Constraint(Entity): constraint. """ cdef int value - campl.AMPL_InstanceGetIntSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_DEFVAR, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetIntSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_DEFVAR, &value)) return value def dinit(self): @@ -106,7 +106,7 @@ cdef class Constraint(Entity): Get the current initial guess for the constraint's dual variable. """ cdef double value - campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_DINIT, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_DINIT, &value)) return value def dinit0(self): @@ -114,7 +114,7 @@ cdef class Constraint(Entity): Get the original initial guess for the constraint's dual variable. """ cdef double value - campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_DINIT0, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_DINIT0, &value)) return value def dual(self): @@ -127,7 +127,7 @@ cdef class Constraint(Entity): (see :func:`~amplpy.AMPL.setOption`). """ cdef double value - campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_DUAL, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_DUAL, &value)) return value def lb(self): @@ -135,7 +135,7 @@ cdef class Constraint(Entity): Get the current value of the constraint's lower bound. """ cdef double value - campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_LB, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_LB, &value)) return value def ub(self): @@ -143,7 +143,7 @@ cdef class Constraint(Entity): Get the current value of the constraint's upper bound. """ cdef double value - campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_UB, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_UB, &value)) return value def lbs(self): @@ -152,7 +152,7 @@ cdef class Constraint(Entity): adjustment for fixed variables). """ cdef double value - campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_LBS, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_LBS, &value)) return value def ubs(self): @@ -161,7 +161,7 @@ cdef class Constraint(Entity): adjustment for fixed variables). """ cdef double value - campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_UBS, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_UBS, &value)) return value def ldual(self): @@ -169,7 +169,7 @@ cdef class Constraint(Entity): Get the current dual value associated with the lower bound. """ cdef double value - campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_LDUAL, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_LDUAL, &value)) return value def udual(self): @@ -177,7 +177,7 @@ cdef class Constraint(Entity): Get the current dual value associated with the upper bounds. """ cdef double value - campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_UDUAL, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_UDUAL, &value)) return value def lslack(self): @@ -185,7 +185,7 @@ cdef class Constraint(Entity): Get the slack at lower bound `body - lb`. """ cdef double value - campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_LSLACK, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_LSLACK, &value)) return value def uslack(self): @@ -201,7 +201,7 @@ cdef class Constraint(Entity): Constraint slack (the lesser of lslack and uslack). """ cdef double value - campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_SLACK, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_SLACK, &value)) return value def sstatus(self): @@ -240,7 +240,7 @@ cdef class Constraint(Entity): Args: dual: The value to be assigned to the dual variable. """ - campl.AMPL_ConstraintSetDual(self._c_ampl, self._name, float(dual)) + PY_AMPL_CALL(campl.AMPL_ConstraintSetDual(self._c_ampl, self._name, float(dual))) def val(self): """ @@ -248,7 +248,7 @@ cdef class Constraint(Entity): """ cdef double value if self.is_logical(): - campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_VAL, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_VAL, &value)) return value else: return None diff --git a/amplpy/entity.pxi b/amplpy/entity.pxi index 55bcdad..dd3fefd 100644 --- a/amplpy/entity.pxi +++ b/amplpy/entity.pxi @@ -39,7 +39,7 @@ cdef class Entity(object): cdef object _entity @staticmethod - cdef create(campl.AMPL* ampl_c, char *name, campl.AMPL_TUPLE* index, parent): + cdef create(campl.AMPL* ampl_c, char *name, campl.AMPL_TUPLE* index, object parent): cdef campl.AMPL_ERRORINFO* errorinfo cdef campl.AMPL_RETCODE rc cdef campl.AMPL_ENTITYTYPE entitytype diff --git a/amplpy/objective.pxi b/amplpy/objective.pxi index 41e3774..99fcba7 100644 --- a/amplpy/objective.pxi +++ b/amplpy/objective.pxi @@ -38,7 +38,7 @@ cdef class Objective(Entity): Get the value of the objective. """ cdef double value - campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, NULL, campl.AMPL_NUMERICSUFFIX.AMPL_VALUE, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, NULL, campl.AMPL_NUMERICSUFFIX.AMPL_VALUE, &value)) return value def astatus(self): @@ -67,7 +67,7 @@ cdef class Objective(Entity): objective. """ cdef int value - campl.AMPL_InstanceGetIntSuffix(self._c_ampl, self._name, NULL, campl.AMPL_NUMERICSUFFIX.AMPL_EXITCODE, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetIntSuffix(self._c_ampl, self._name, NULL, campl.AMPL_NUMERICSUFFIX.AMPL_EXITCODE, &value)) return value def message(self): @@ -96,13 +96,13 @@ cdef class Objective(Entity): """ Drop this objective instance. """ - campl.AMPL_EntityDrop(self._c_ampl, self._name) + PY_AMPL_CALL(campl.AMPL_EntityDrop(self._c_ampl, self._name)) def restore(self): """ Restore this objective (if it had been dropped, no effect otherwise). """ - campl.AMPL_EntityRestore(self._c_ampl, self._name) + PY_AMPL_CALL(campl.AMPL_EntityRestore(self._c_ampl, self._name)) def minimization(self): """ diff --git a/amplpy/outputhandler.pxi b/amplpy/outputhandler.pxi index bf72404..1796c99 100644 --- a/amplpy/outputhandler.pxi +++ b/amplpy/outputhandler.pxi @@ -1,5 +1,8 @@ # -*- coding: utf-8 -*- +from enum import Enum + + cdef class OutputHandler(object): """ Interface to handle the outputs from the calls to any @@ -30,195 +33,317 @@ cdef void PyOutput(campl.AMPL_OUTPUTKIND kind, const char* msg, void* usrdata) e PyOutputHandler = usrdata PyOutputHandler.output(kind, str(msg.decode('utf-8'))) -class Kind(object): +class Kind(Enum): """ Represents the type of the output coming from the interpreter. """ - #: Output ``prompt2``, returned when incomplete statements are interpreted. WAITING = campl.AMPL_OUTPUT_WAITING + """ + Output ``prompt2``, returned when incomplete statements are interpreted. + """ - #: Output ``break``, displayed when an operation is interrupted with SIGINT. BREAK = campl.AMPL_OUTPUT_BREAK + """ + Output ``break``, displayed when an operation is interrupted with SIGINT. + """ - #: Output ``cd``, returned by the ``cd`` function. CD = campl.AMPL_OUTPUT_CD + """ + Output ``cd``, returned by the ``cd`` function. + """ - #: Output ``display``, returned by the ``display`` function. DISPLAY = campl.AMPL_OUTPUT_DISPLAY + """ + Output ``display``, returned by the ``display`` function. + """ - #: Output ``exit``, returned as last message from AMPL before exiting the - #: interpreter. EXIT = campl.AMPL_OUTPUT_EXIT + """ + Output ``exit``, returned as last message from AMPL before exiting the + interpreter. + """ - #: Output ``expand``, returned by the ``expand`` function. EXPAND = campl.AMPL_OUTPUT_EXPAND + """ + Output ``expand``, returned by the ``expand`` function. + """ - #: Output ``load``, returned by the ``load`` function when loading a library. LOAD = campl.AMPL_OUTPUT_LOAD + """ + Output ``load``, returned by the ``load`` function when loading a library. + """ - #: Output ``option``, returned by the ``option`` function when getting the - #: value of an option. OPTION = campl.AMPL_OUTPUT_OPTION + """ + Output ``option``, returned by the ``option`` function when getting the + value of an option. + """ - #: Output ``print``, returned by the ``print`` function when printing values - #: from AMPL command line. PRINT = campl.AMPL_OUTPUT_PRINT + """ + Output ``print``, returned by the ``print`` function when printing values + from AMPL command line. + """ - #: Output ``prompt1``, normal AMPL prompt. PROMPT = campl.AMPL_OUTPUT_PROMPT # prompt1 and prompt3 + """ + Output ``prompt1``, normal AMPL prompt. + """ - #: Output ``solution``, returned when loading a solution with the command - #: ``solution``, contains the solver message. SOLUTION = campl.AMPL_OUTPUT_SOLUTION + """ + Output ``solution``, returned when loading a solution with the command + ``solution``, contains the solver message. + """ - #: Output ``solve``, returned by the ``solve`` function, contains the solver - #: message. SOLVE = campl.AMPL_OUTPUT_SOLVE + """ + Output ``solve``, returned by the ``solve`` function, contains the solver + message. + """ - #: Output ``show``, returned by the ``show`` function. SHOW = campl.AMPL_OUTPUT_SHOW + """ + Output ``show``, returned by the ``show`` function. + """ - #: Output ``xref``, returned by the ``xref`` function. XREF = campl.AMPL_OUTPUT_XREF + """ + Output ``xref``, returned by the ``xref`` function. + """ - #: Output of the AMPL command ``shell``. SHELL_OUTPUT = campl.AMPL_OUTPUT_SHELL_OUTPUT + """ + Output of the AMPL command ``shell``. + """ - #: Messages from the command ``shell``. SHELL_MESSAGE = campl.AMPL_OUTPUT_SHELL_MESSAGE + """ + Messages from the command ``shell``. + """ - #: Output ``misc``. MISC = campl.AMPL_OUTPUT_MISC + """ + Output ``misc``. + """ - #: Messages from the command ``write table``. WRITE_TABLE = campl.AMPL_OUTPUT_WRITE_TABLE + """ + Messages from the command ``write table``. + """ - #: Messages from the command ``read table``. READ_TABLE = campl.AMPL_OUTPUT_READ_TABLE + """ + Messages from the command ``read table``. + """ - #: Internal messages from the command ``read table``. _READTABLE = campl.AMPL_OUTPUT_READTABLE + """ + Internal messages from the command ``read table``. + """ - #: Internal messages from the command ``write table``. _WRITETABLE = campl.AMPL_OUTPUT_WRITETABLE + """ + Internal messages from the command ``write table``. + """ - #: Breakpoint hit. BREAKPOINT = campl.AMPL_OUTPUT_BREAKPOINT + """ + Breakpoint hit. + """ - #: Output of a script ``call``. CALL = campl.AMPL_OUTPUT_CALL + """ + Output of a script ``call``. + """ - #: Output of a ``check`` operation. CHECK = campl.AMPL_OUTPUT_CHECK + """ + Output of a ``check`` operation. + """ - #: Output of a ``close`` command for output redirection. CLOSE = campl.AMPL_OUTPUT_CLOSE + """ + Output of a ``close`` command for output redirection. + """ - #: Output of a ``commands`` call into another file. COMMANDS = campl.AMPL_OUTPUT_COMMANDS + """ + Output of a ``commands`` call into another file. + """ - #: Issued when ``continue`` is encountered. CONTINUE = campl.AMPL_OUTPUT_CONTINUE + """ + Issued when ``continue`` is encountered. + """ - #: Output of a ``data`` command. DATA = campl.AMPL_OUTPUT_DATA + """ + Output of a ``data`` command. + """ - #: Output of a ``delete`` command. DELETECMD = campl.AMPL_OUTPUT_DELETECMD + """ + Output of a ``delete`` command. + """ - #: Output of a ``drop`` command. DROP = campl.AMPL_OUTPUT_DROP + """ + Output of a ``drop`` command. + """ - #: Internal. DROP_OR_RESTORE_ALL = campl.AMPL_OUTPUT_DROP_OR_RESTORE_ALL + """ + Internal. + """ - #: Else block. _ELSE = campl.AMPL_OUTPUT_ELSE + """ + Else block. + """ - #: Internal. ELSE_CHECK = campl.AMPL_OUTPUT_ELSE_CHECK + """ + Internal. + """ - #: End of if block. ENDIF = campl.AMPL_OUTPUT_ENDIF + """ + End of if block. + """ - #: Output of a ``environ`` command. ENVIRON = campl.AMPL_OUTPUT_ENVIRON + """ + Output of a ``environ`` command. + """ - #: Output of a ``fix`` command. FIX = campl.AMPL_OUTPUT_FIX + """ + Output of a ``fix`` command. + """ - #: Output of a ``for`` command. FOR = campl.AMPL_OUTPUT_FOR + """ + Output of a ``for`` command. + """ - #: Output of an ``if`` command. _IF = campl.AMPL_OUTPUT_IF + """ + Output of an ``if`` command. + """ - #: Output of a ``let`` command. LET = campl.AMPL_OUTPUT_LET + """ + Output of a ``let`` command. + """ - #: End of loop. LOOPEND = campl.AMPL_OUTPUT_LOOPEND + """ + End of loop. + """ - #: Output of an ``objective`` command. OBJECTIVE = campl.AMPL_OUTPUT_OBJECTIVE + """ + Output of an ``objective`` command. + """ - #: Occurs when resetting option values. OPTION_RESET = campl.AMPL_OUTPUT_OPTION_RESET + """ + Occurs when resetting option values. + """ - #: Output of a ``printf`` command. PRINTF = campl.AMPL_OUTPUT_PRINTF + """ + Output of a ``printf`` command. + """ - #: Output of a ``problem`` command. PROBLEM = campl.AMPL_OUTPUT_PROBLEM + """ + Output of a ``problem`` command. + """ - #: Output of a ``purge`` command. PURGE = campl.AMPL_OUTPUT_PURGE + """ + Output of a ``purge`` command. + """ - #: Occurs when a right brace is encountered. RBRACE = campl.AMPL_OUTPUT_RBRACE + """ + Occurs when a right brace is encountered. + """ - #: Output of a ``read`` command. READ = campl.AMPL_OUTPUT_READ + """ + Output of a ``read`` command. + """ - #: Output of a ``reload`` command. RELOAD = campl.AMPL_OUTPUT_RELOAD + """ + Output of a ``reload`` command. + """ - #: Output of a ``remove`` command. REMOVE = campl.AMPL_OUTPUT_REMOVE + """ + Output of a ``remove`` command. + """ - #: Beginning of a repeat loop. REPEAT = campl.AMPL_OUTPUT_REPEAT + """ + Beginning of a repeat loop. + """ - #: End of a repeat loop. REPEAT_END = campl.AMPL_OUTPUT_REPEAT_END + """ + End of a repeat loop. + """ - #: Output of a ``reset`` command. RESET = campl.AMPL_OUTPUT_RESET + """ + Output of a ``reset`` command. + """ - #: Output of a ``restore`` command. RESTORE = campl.AMPL_OUTPUT_RESTORE + """ + Output of a ``restore`` command. + """ - #: Internal. RUN_ARGS = campl.AMPL_OUTPUT_RUN_ARGS + """ + Internal. + """ - #: Internal. SEMICOLON = campl.AMPL_OUTPUT_SEMICOLON + """ + Internal. + """ - #: Internal. SSTEP = campl.AMPL_OUTPUT_SSTEP + """ + Internal. + """ - #: Beginning of the ``then`` part of an if statement. THEN = campl.AMPL_OUTPUT_THEN + """ + Beginning of the ``then`` part of an if statement. + """ - #: Output of an ``unfix`` command. UNFIX = campl.AMPL_OUTPUT_UNFIX + """ + Output of an ``unfix`` command. + """ - #: Output of an ``unload`` command. UNLOAD = campl.AMPL_OUTPUT_UNLOAD + """ + Output of an ``unload`` command. + """ - #: Output of an ``update`` command. UPDATE = campl.AMPL_OUTPUT_UPDATE + """ + Output of an ``update`` command. + """ - #: Output of a ``write`` command. WRITE = campl.AMPL_OUTPUT_WRITE + """ + Output of a ``write`` command. + """ diff --git a/amplpy/variable.pxi b/amplpy/variable.pxi index 93e48db..d5dfeff 100644 --- a/amplpy/variable.pxi +++ b/amplpy/variable.pxi @@ -40,7 +40,7 @@ cdef class Variable(Entity): Get the current value of this variable. """ cdef double value - campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_VALUE, &value) + PY_AMPL_CALL(campl.AMPL_InstanceGetDoubleSuffix(self._c_ampl, self._name, self._index, campl.AMPL_NUMERICSUFFIX.AMPL_VALUE, &value)) return value def fix(self, value=None): @@ -52,15 +52,15 @@ cdef class Variable(Entity): value: value to be set. """ if value is None: - campl.AMPL_VariableInstanceFix(self._c_ampl, self._name, self._index) + PY_AMPL_CALL(campl.AMPL_VariableInstanceFix(self._c_ampl, self._name, self._index)) else: - campl.AMPL_VariableInstanceFixToValue(self._c_ampl, self._name, self._index, value) + PY_AMPL_CALL(campl.AMPL_VariableInstanceFixToValue(self._c_ampl, self._name, self._index, value)) def unfix(self): """ Unfix all instances of this variable. """ - campl.AMPL_VariableInstanceUnfix(self._c_ampl, self._name, self._index) + PY_AMPL_CALL(campl.AMPL_VariableInstanceUnfix(self._c_ampl, self._name, self._index)) def set_value(self, value): """ diff --git a/docs/requirements-dev.txt b/docs/requirements-dev.txt index 58aafad..0807cc5 100644 --- a/docs/requirements-dev.txt +++ b/docs/requirements-dev.txt @@ -1,5 +1 @@ -#pydata-sphinx-theme==0.7.1 -ampl-sphinx-theme @ git+https://github.com/ampl/ampl.github.io.git#subdirectory=ampl-sphinx-theme -sphinx==4.2.0 -myst_parser>=0.17.0 -sphinx_design==0.3.0 +ampl-sphinx-theme @ git+https://github.com/ampl/ampl.github.io.git#subdirectory=themes/ampl_sphinx_theme diff --git a/docs/source/classes/constraint.rst b/docs/source/classes/constraint.rst index afaf72a..0cbc400 100644 --- a/docs/source/classes/constraint.rst +++ b/docs/source/classes/constraint.rst @@ -8,4 +8,5 @@ Constraint :members: :undoc-members: :special-members: - :exclude-members: __dict__,__weakref__,__module__,__init__,isLogical,setDual \ No newline at end of file + :exclude-members: __dict__,__weakref__,__module__,__init__,isLogical,setDual, + __delitem__,__new__,__pyx_vtable__,__reduce__,__setstate__ \ No newline at end of file diff --git a/docs/source/classes/dataframe.rst b/docs/source/classes/dataframe.rst index 5289bf7..923434f 100644 --- a/docs/source/classes/dataframe.rst +++ b/docs/source/classes/dataframe.rst @@ -8,6 +8,7 @@ DataFrame :members: :undoc-members: :special-members: - :exclude-members: __dict__,__weakref__,__module__,__init__,__iter__,addColumn,add_column,addRow,add_row,fromDict,fromNumpy,fromPandas,getColumn,get_column,getHeaders,get_headers,getNumCols,get_num_cols,getNumIndices,get_num_indices,getNumRows,get_num_rows,getRow,get_row,getRowByIndex,get_row_by_index,setColumn,set_column,setValues,set_values,toDict,toList,toPandas + :exclude-members: __dict__,__weakref__,__module__,__init__,__iter__,addColumn,add_column,addRow,add_row,fromDict,fromNumpy,fromPandas,getColumn,get_column,getHeaders,get_headers,getNumCols,get_num_cols,getNumIndices,get_num_indices,getNumRows,get_num_rows,getRow,get_row,getRowByIndex,get_row_by_index,setColumn,set_column,setValues,set_values,toDict,toList,toPandas, + __new__,__pyx_vtable__,__reduce__,__setstate__ diff --git a/docs/source/classes/entity.rst b/docs/source/classes/entity.rst index d388a23..941dbfd 100644 --- a/docs/source/classes/entity.rst +++ b/docs/source/classes/entity.rst @@ -8,4 +8,5 @@ Entity :members: :undoc-members: :special-members: - :exclude-members: __dict__,__weakref__,__module__,__init__,getIndexingSets,getValues,isScalar,numInstances,setValues + :exclude-members: __dict__,__weakref__,__module__,__init__,getIndexingSets,getValues,isScalar,numInstances,setValues, + __new__,__pyx_vtable__,__reduce__,__setstate__ diff --git a/docs/source/classes/environment.rst b/docs/source/classes/environment.rst index 31ab30d..2b9e025 100644 --- a/docs/source/classes/environment.rst +++ b/docs/source/classes/environment.rst @@ -8,4 +8,5 @@ Environment :members: :undoc-members: :special-members: - :exclude-members: __dict__,__weakref__,__module__,getBinDir,getBinName,setBinDir,setBinName + :exclude-members: __dict__,__weakref__,__module__,getBinDir,getBinName,setBinDir,setBinName, + __delitem__,__new__,__pyx_vtable__,__reduce__,__setstate__,__str__ diff --git a/docs/source/classes/errorhandler.rst b/docs/source/classes/errorhandler.rst index ae60769..6077f28 100644 --- a/docs/source/classes/errorhandler.rst +++ b/docs/source/classes/errorhandler.rst @@ -8,4 +8,5 @@ ErrorHandler :members: :undoc-members: :special-members: - :exclude-members: __dict__,__weakref__,__module__ + :exclude-members: __dict__,__weakref__,__module__, + __new__,__reduce__,__reduce_cython__, __setstate__,__setstate_cython__ diff --git a/docs/source/classes/objective.rst b/docs/source/classes/objective.rst index 8ad1873..ec990f2 100644 --- a/docs/source/classes/objective.rst +++ b/docs/source/classes/objective.rst @@ -9,3 +9,4 @@ Objective :undoc-members: :special-members: :exclude-members: __dict__,__weakref__,__module__,__init__, + __new__,__pyx_vtable__,__reduce__,__setstate__ diff --git a/docs/source/classes/outputhandler.rst b/docs/source/classes/outputhandler.rst index fc83728..fd793f5 100644 --- a/docs/source/classes/outputhandler.rst +++ b/docs/source/classes/outputhandler.rst @@ -8,7 +8,8 @@ OutputHandler :members: :undoc-members: :special-members: - :exclude-members: __dict__,__weakref__,__module__ + :exclude-members: __dict__,__weakref__,__module__, + __new__,__reduce__,__reduce_cython__, __setstate__,__setstate_cython__ .. autoclass:: amplpy.Kind diff --git a/docs/source/classes/parameter.rst b/docs/source/classes/parameter.rst index 5d9a7e0..e958d6e 100644 --- a/docs/source/classes/parameter.rst +++ b/docs/source/classes/parameter.rst @@ -8,4 +8,5 @@ Parameter :members: :undoc-members: :special-members: - :exclude-members: __dict__,__weakref__,__module__,__init__,hasDefault,isSymbolic,setValues + :exclude-members: __dict__,__weakref__,__module__,__init__,hasDefault,isSymbolic,setValues, + __delitem__,__new__,__pyx_vtable__,__reduce__,__setstate__ diff --git a/docs/source/classes/set.rst b/docs/source/classes/set.rst index a6aa92e..7ae0839 100644 --- a/docs/source/classes/set.rst +++ b/docs/source/classes/set.rst @@ -8,4 +8,5 @@ Set :members: :undoc-members: :special-members: - :exclude-members: __dict__,__weakref__,__module__,__init__,getValues,setValues + :exclude-members: __dict__,__weakref__,__module__,__init__,getValues,setValues, + __delitem__,__new__,__pyx_vtable__,__reduce__,__setstate__ diff --git a/docs/source/classes/variable.rst b/docs/source/classes/variable.rst index 05d5478..6898440 100644 --- a/docs/source/classes/variable.rst +++ b/docs/source/classes/variable.rst @@ -8,4 +8,5 @@ Variable :members: :undoc-members: :special-members: - :exclude-members: __dict__,__weakref__,__module__,__init__,setValue + :exclude-members: __dict__,__weakref__,__module__,__init__,setValue, + __delitem__,__new__,__pyx_vtable__,__reduce__,__setstate__