maialib 1.9.2__cp38-cp38-macosx_10_15_universal2.whl → 1.9.4__cp38-cp38-macosx_10_15_universal2.whl

maialib/maiacore/maiacore.pyi

@@ -1366,10 +1366,10 @@ class ScoreCollection:
     def clear(self) -> None:
         ...
     @typing.overload
-    def findMelodyPattern(self, melodyPattern: list[Note], totalIntervalsSimilarityThreshold: float = 0.5, totalRhythmSimilarityThreshold: float = 0.5, intervalsSimilarityCallback: typing.Callable[[list[Note], list[Note]], list[float]] = None, rhythmSimilarityCallback: typing.Callable[[list[Note], list[Note]], list[float]] = None, totalIntervalSimilarityCallback: typing.Callable[[list[float]], float] = None, totalRhythmSimilarityCallback: typing.Callable[[list[float]], float] = None, totalSimilarityCallback: typing.Callable[[float, float], float] = None) -> typing.Any:
+    def findMelodyPatternDataFrame(self, melodyPattern: list[Note], totalIntervalsSimilarityThreshold: float = 0.5, totalRhythmSimilarityThreshold: float = 0.5, intervalsSimilarityCallback: typing.Callable[[list[Note], list[Note]], list[float]] = None, rhythmSimilarityCallback: typing.Callable[[list[Note], list[Note]], list[float]] = None, totalIntervalSimilarityCallback: typing.Callable[[list[float]], float] = None, totalRhythmSimilarityCallback: typing.Callable[[list[float]], float] = None, totalSimilarityCallback: typing.Callable[[float, float], float] = None) -> typing.Any:
         ...
     @typing.overload
-    def findMelodyPattern(self, melodyPatterns: list[list[Note]], totalIntervalsSimilarityThreshold: float = 0.5, totalRhythmSimilarityThreshold: float = 0.5, intervalsSimilarityCallback: typing.Callable[[list[Note], list[Note]], list[float]] = None, rhythmSimilarityCallback: typing.Callable[[list[Note], list[Note]], list[float]] = None, totalIntervalSimilarityCallback: typing.Callable[[list[float]], float] = None, totalRhythmSimilarityCallback: typing.Callable[[list[float]], float] = None, totalSimilarityCallback: typing.Callable[[float, float], float] = None) -> typing.Any:
+    def findMelodyPatternDataFrame(self, melodyPatterns: list[list[Note]], totalIntervalsSimilarityThreshold: float = 0.5, totalRhythmSimilarityThreshold: float = 0.5, intervalsSimilarityCallback: typing.Callable[[list[Note], list[Note]], list[float]] = None, rhythmSimilarityCallback: typing.Callable[[list[Note], list[Note]], list[float]] = None, totalIntervalSimilarityCallback: typing.Callable[[list[float]], float] = None, totalRhythmSimilarityCallback: typing.Callable[[list[float]], float] = None, totalSimilarityCallback: typing.Callable[[float, float], float] = None) -> typing.Any:
         ...
     def getDirectoriesPaths(self) -> list[str]:
         ...
@@ -1411,4 +1411,4 @@ C: ClefSign  # value = <ClefSign.C: 2>
 F: ClefSign  # value = <ClefSign.F: 1>
 G: ClefSign  # value = <ClefSign.G: 0>
 P: ClefSign  # value = <ClefSign.P: 3>
-__version__: str = '"1.9.2"'
+__version__: str = '"1.9.4"'

maialib/maiapy/sethares_dissonance.py

@@ -282,7 +282,8 @@ def plotScoreSetharesDissonance(score: mc.Score, plotType='line', lineShape='lin
 
 
 def plotChordDyadsSetharesDissonanceHeatmap(chord: mc.Chord, numPartialsPerNote: int = 6, useMinModel: bool = True, amplCallback: Optional[Callable[[
-        List[float]], List[float]]] = None, dissonanceThreshold: float = 0.1, dissonanceDecimalPoint: int = 2) -> Tuple[plotly.graph_objs._figure.Figure, pd.DataFrame]:
+    List[float]], List[float]]] = None, dissonanceThreshold: float = 0.1, dissonanceDecimalPoint: int = 2, showValues: bool = False,
+        valuesDecimalPlaces: int = 2) -> Tuple[plotly.graph_objs._figure.Figure, pd.DataFrame]:
     """Plot chord dyads Sethares dissonance heatmap
 
     Args:
@@ -295,6 +296,8 @@ def plotChordDyadsSetharesDissonanceHeatmap(chord: mc.Chord, numPartialsPerNote:
        amplCallback: Custom user function callback to generate the amplitude of each spectrum partial
        dissonanceThreshold (float): Dissonance threshold to skip small dissonance values
        dissonanceDecimalPoint (int): Round chord dissonance value in the plot title
+       showValues (bool): If True, show numerical values inside heatmap cells
+       valuesDecimalPlaces (int): Number of decimal places to display in cell values
 
     Returns:
        A list: [Plotly Figure, The plot data as a Pandas Dataframe]
@@ -313,30 +316,61 @@ def plotChordDyadsSetharesDissonanceHeatmap(chord: mc.Chord, numPartialsPerNote:
         numPartialsPerNote=numPartialsPerNote, useMinModel=useMinModel, amplCallback=amplCallback)
     dfFiltered = df[df.dissonance > dissonanceThreshold]
 
-    # Pivot the dataframe to create a matrix with baseFreq on X and targetFreq on Y
+    # Pivot para matriz (targetFreq como linhas, baseFreq como colunas)
     matrix_df = dfFiltered.pivot(
-        index='targetFreq', columns='baseFreq', values='dissonance')
+        index='targetFreq', columns='baseFreq', values='dissonance'
+    )
 
-    # Create a heatmap using Plotly
-    fig = px.imshow(matrix_df,
-                    labels=dict(x="Base Frequency (Hz)",
-                                y="Target Frequency (Hz)", color="Dissonance"),
-                    color_continuous_scale='Inferno')
+    # Reordena linhas e colunas para consistência
+    matrix_df = matrix_df.reindex(
+        index=sorted(matrix_df.index),
+        columns=sorted(matrix_df.columns)
+    )
 
-    # Extract unique frequencies for x and y ticks
-    x_ticks = sorted(matrix_df.columns.unique())  # baseFreq
-    y_ticks = sorted(matrix_df.index.unique())    # targetFreq
+    # Índices para o heatmap uniforme
+    x_ticks = list(range(len(matrix_df.columns)))
+    y_ticks = list(range(len(matrix_df.index)))
 
-    roundedXTicksValues = [round(num, 0) for num in x_ticks]
-    roundedYTicksValues = [round(num, 0) for num in y_ticks]
+    # Labels reais (frequências)
+    x_labels = [round(v, 0) for v in matrix_df.columns]
+    y_labels = [round(v, 0) for v in matrix_df.index]
 
-    fig.update_xaxes(type='linear', tickvals=x_ticks,
-                     ticktext=roundedXTicksValues)
-    fig.update_yaxes(type='linear', tickvals=y_ticks,
-                     ticktext=roundedYTicksValues, autorange=True)
+    # Formatação do texto (caso showValues=True)
+    if showValues:
+        text_format = f".{valuesDecimalPlaces}f"
+    else:
+        text_format = False
+
+    # Criar heatmap com quadrados iguais
+    fig = px.imshow(
+        matrix_df.values,
+        labels=dict(x="Base Frequency (Hz)",
+                    y="Target Frequency (Hz)", color="Dissonance"),
+        color_continuous_scale="Inferno",
+        origin="lower",   # força o eixo Y a começar por baixo
+        text_auto=text_format
+    )
 
+    # Ajusta ticks para mostrar frequências reais
+    fig.update_xaxes(
+        tickmode="array",
+        tickvals=x_ticks,
+        ticktext=x_labels
+    )
+    fig.update_yaxes(
+        tickmode="array",
+        tickvals=y_ticks,
+        ticktext=y_labels,
+    )
+
+    # Mantém os quadrados sempre iguais
+    fig.update_yaxes(scaleanchor="x", scaleratio=1)
+
+    # Título
     roundedDissonanceValue = round(df.dissonance.sum(), dissonanceDecimalPoint)
     fig.update_layout(
-        title=f'<b>Chord Dyads Sethares Dissonance Heatmap</b><br><i>Chord Dissonance={str(roundedDissonanceValue)}</i>', title_x=0.5)
+        title=f'<b>Chord Dyads Sethares Dissonance Heatmap</b><br><i>Chord Dissonance={roundedDissonanceValue}</i>',
+        title_x=0.5
+    )
 
     return fig, dfFiltered

maialib/maiapy/sethares_dissonance.pyi

@@ -42,7 +42,7 @@ def plotScoreSetharesDissonance(score: mc.Score, plotType: str = 'line', lineSha
     >>> ml.plotScoreSetharesDissonance(myScore, numPoints=15)
     >>> ml.plotScoreSetharesDissonance(myScore, measureStart=10, measureEnd=20)
     '''
-def plotChordDyadsSetharesDissonanceHeatmap(chord: mc.Chord, numPartialsPerNote: int = 6, useMinModel: bool = True, amplCallback: Callable[[list[float]], list[float]] | None = None, dissonanceThreshold: float = 0.1, dissonanceDecimalPoint: int = 2) -> tuple[plotly.graph_objs._figure.Figure, pd.DataFrame]:
+def plotChordDyadsSetharesDissonanceHeatmap(chord: mc.Chord, numPartialsPerNote: int = 6, useMinModel: bool = True, amplCallback: Callable[[list[float]], list[float]] | None = None, dissonanceThreshold: float = 0.1, dissonanceDecimalPoint: int = 2, showValues: bool = False, valuesDecimalPlaces: int = 2) -> tuple[plotly.graph_objs._figure.Figure, pd.DataFrame]:
     '''Plot chord dyads Sethares dissonance heatmap
 
     Args:
@@ -55,6 +55,8 @@ def plotChordDyadsSetharesDissonanceHeatmap(chord: mc.Chord, numPartialsPerNote:
        amplCallback: Custom user function callback to generate the amplitude of each spectrum partial
        dissonanceThreshold (float): Dissonance threshold to skip small dissonance values
        dissonanceDecimalPoint (int): Round chord dissonance value in the plot title
+       showValues (bool): If True, show numerical values inside heatmap cells
+       valuesDecimalPlaces (int): Number of decimal places to display in cell values
 
     Returns:
        A list: [Plotly Figure, The plot data as a Pandas Dataframe]

{maialib-1.9.2.dist-info → maialib-1.9.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maialib
-Version: 1.9.2
+Version: 1.9.4
 Summary: A C++/Python library to manipulate sheet music data
 Home-page: https://github.com/nyckmaia/maialib
 Author: Nycholas Maia
@@ -28,12 +28,13 @@ Requires-Dist: nbformat
 
 ![Maialib CI/CD](https://github.com/nyckmaia/maialib/actions/workflows/wheels.yml/badge.svg)
 
-This library is a multiplatform set of musical tools that enable musical score analisys and composition in a easy and fast way. <br>
-The project **core** was wrote in `C++17`, but it also has a `Python` wrapper that allows a greater number of people (ie musicians not trained in IT) to also have in their hands the same power and musical tools available in `maialib`.
+This library is a multiplatform set of musical tools that enable musical score analysis and composition in an easy and fast way. <br>
+The project **maiacore** was written in `C++17`, but it also has a `Python` wrapper that allows a greater number of people (i.e. musicians not trained in IT) to also have in their hands the same power and musical tools available in `maialib`.<br><br>
+**IMPORTANT: The maialib Python package includes all maiacore classes and functions and some additional other pure python functions. This website covers the maiacore-only classes and functions documentation, which are also present inside the maialib python package.<br>We hope to add documentation of functions written in Python to this site in the future, so that we can have complete documentation of maialib.**
 
 ## Advantages
 
-- Easy to use to musicians and musical researchers
+- Easy to use to by musicians and musical researchers
 - High computer perfomance and fast calculations
 - Read and write musical scores (MusicXML file format)
 
@@ -43,7 +44,7 @@ The project **core** was wrote in `C++17`, but it also has a `Python` wrapper th
 pip install maialib
 ```
 
-Or, if you have a older `maialib` version installed on your system, please get the latest version running: `pip install maialib --upgrade`
+Or, if you have an older `maialib` version installed on your system, please get the latest version running: `pip install maialib --upgrade`
 
 ## Get Started
 
@@ -74,16 +75,23 @@ You can easily export your music files to these file formats above from score ed
 - Finale
 - Others
 
-Many `MusicXML` files are avaliable for free in the internet for download.
+Many `MusicXML` files are avaliable for free in the Internet for download.
 
 ### 2) What can I do if I don't have a `*.xml` file of my target music?
 
-- First, make shure and look at different websites and online repositories trying to find the `*.xml` file
-- You can find on the internet the desired MIDI file and import it in a score editor (like MuseScore, Sibelius, Finale, etc.) and then export the `MusicXML` file from it
-- You can use scan the sheet music paper and get a PDF version of it, so:
-  - You can use a OMR software to try to convert the PDF file into a `*.xml` file
-  - You can pay for other people to type manually note-by-note the PDF into a musical software (link MuseScore, Sibelius, Finale, etc.)
-- You can type manually note-by-note the music paper into a musical software (link MuseScore, Sibelius, Finale, etc.)
+- First, make sure, and look at different websites and online repositories trying to find the `*.xml` (or `*.musicxml` or `*.mxl`) file.
+- After that, you can try these 4 options below:
+  - Find on the internet the desired MIDI file and import it in a score editor (like MuseScore, Sibelius, Finale, etc.) and then export the `MusicXML` file from it
+  - Scan the sheet music paper and get a PDF version of it, and after that, use a OMR software to try to convert the PDF file into a `*.xml` file:
+    - [MuseScore Import - Experimental](https://musescore.com/import)
+    - [ACE Studio PDF to MusicXML Converter](https://acestudio.ai/pdf-to-musicxml/)
+    - [Sibelius PhotoScore](https://www.avid.com/photoscore-and-notateme-lite)
+    - [ScanScore](https://scan-score.com/en/)
+    - [SmartScore 64 NE](https://www.musitek.com/)
+    - [Melogen AI](https://melogenai.com/)
+    - [PDFtoMusic](https://www.myriad-online.com/en/products/pdftomusic.htm)
+  - Pay for other people to type manually note-by-note the PDF into a musical software (link MuseScore, Sibelius, Finale, etc.)
+  - Type manually note-by-note the music paper into a musical software (link MuseScore, Sibelius, Finale, etc.)
 
 ## Documentation (in development)
 
@@ -96,7 +104,7 @@ This project have 2 documentation levels. One for each user type:
 
 You can explore `maialib` features looking at `python-tutorial` folder ([link here](https://github.com/nyckmaia/maialib/tree/main/python-tutorial)). <br>
 There you will learn how to use and mix `maialib` classes and functions to reach your musical goals
-If you are starting, please check these 3 basic `maialib` Python tutorials:
+If you are starting out, please check these 3 basic `maialib` Python tutorials:
 
 - [Create Notes and Chords](https://github.com/nyckmaia/maialib/blob/main/python-tutorial/create_notes_chords.ipynb)
 - [Create a Score](https://github.com/nyckmaia/maialib/blob/main/python-tutorial/create_score.ipynb)
@@ -109,7 +117,7 @@ If you are starting, please check these 3 basic `maialib` Python tutorials:
 ## VS Code Users
 
 - You can write your Python scripts using `*.py` or `*.ipynb` file extensions.
-- If you decide to use `*.ipynb` extension, make shure to install `nbformat` Python package to enable visualize maialib graphs on VS Code editor.
+- If you decide to use `*.ipynb` extension, make sure to install `nbformat` Python package to enable visualize maialib graphs on VS Code editor.
   To do that: `pip install nbformat --upgrade`
 
 ---
@@ -182,7 +190,7 @@ Nycholas Maia - nyckmaia@gmail.com
 ## Contributing
 
 - Fork this project
-- Make your custumizations and improvments
+- Make your custumizations and improvements
 - Please, send me a pull request
 
 ## License

{maialib-1.9.2.dist-info → maialib-1.9.4.dist-info}/RECORD

@@ -1,8 +1,8 @@
-maialib-1.9.2.dist-info/RECORD,,
-maialib-1.9.2.dist-info/WHEEL,sha256=cBy-JNWg3y6KmLE-K2kxS_UNVKfvgmw6eBcsGF4eLP4,113
-maialib-1.9.2.dist-info/top_level.txt,sha256=sZWQaa-Up2ba00WpAxBhOLKM6qQYTpUKJMXgSE0Nc48,17
-maialib-1.9.2.dist-info/LICENSE.txt,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-maialib-1.9.2.dist-info/METADATA,sha256=sUAWbVDCxKBgGMd1rWm4Xe2l1h5J6lWJAf8J9Vw1Bc8,7051
+maialib-1.9.4.dist-info/RECORD,,
+maialib-1.9.4.dist-info/WHEEL,sha256=cBy-JNWg3y6KmLE-K2kxS_UNVKfvgmw6eBcsGF4eLP4,113
+maialib-1.9.4.dist-info/top_level.txt,sha256=sZWQaa-Up2ba00WpAxBhOLKM6qQYTpUKJMXgSE0Nc48,17
+maialib-1.9.4.dist-info/LICENSE.txt,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+maialib-1.9.4.dist-info/METADATA,sha256=na23GjO9h3WRrQ4DlDDc9klrMiIkmL940cE8esl05TY,7990
 maialib/__init__.py,sha256=qiIEL1ZDvpDK0bkGUdZRib3bG973EtKQDFYPFfvJKQA,122
 maialib/setup.py,sha256=1Cbv0DfEUNK1EQHb64-1B0rwbRrsTSnJBY8fVn8gtbU,2168
 maialib/xml-scores-examples/Mahler_Symphony_8_Finale.mxl,sha256=F2-QBKNYjBv_sWT-z4LWi1rX84-P3msxtl-g6joA2FQ,229034
@@ -14,13 +14,13 @@ maialib/xml-scores-examples/Strauss_Also_Sprach_Zarathustra.mxl,sha256=nOQra05RH
 maialib/xml-scores-examples/Bach_Cello_Suite_1.mxl,sha256=0XGNlcW8o0W7kkeG8j2V_M4eggdOnrxvvvCkpf6x_z4,29622
 maialib/maiacore/__init__.pyi,sha256=cJfflEKHJ6BPUTlDQt95xZmi2N3zwHJkHEXy27fBd5c,1282
 maialib/maiacore/__init__.py,sha256=IW7E0LuzAttsn0b37SEthCA0LKuzSgkepSpq8DWExYQ,77
-maialib/maiacore/maiacore.pyi,sha256=v93jv2Ou7tTPs1-rsBaAEyfrYbXsEPewy9txJek3mt4,48398
-maialib/maiacore/maiacore.cpython-38-darwin.so,sha256=OxX1-M7Rd5Po_oLzfc_ZkhxM0TefxbBHfxje1N86XOY,8222704
+maialib/maiacore/maiacore.pyi,sha256=nQkrQ-uQjpoYY275mnJGtqP42rLvGLasBFPtylYN3tM,48416
+maialib/maiacore/maiacore.cpython-38-darwin.so,sha256=ZynzZz1Q8CAw_Pxt7D21mna4aQXMXdgkd6xl2k_Tb74,8222704
 maialib/maiapy/other.pyi,sha256=jEmAc-MDc3iMA2-5hp41RLgNrfBQRMvq-sF2_pexhbo,2163
 maialib/maiapy/__init__.pyi,sha256=L8YtZYJMw_9TrdejcKs2c5xTbu5WMRwlHhKz6Qzulf8,77
 maialib/maiapy/__init__.py,sha256=L8YtZYJMw_9TrdejcKs2c5xTbu5WMRwlHhKz6Qzulf8,77
 maialib/maiapy/other.py,sha256=4LjETHcpDpNRjSYIbMW_9CuRZTymuoAzog_L3CkYDA0,4345
-maialib/maiapy/sethares_dissonance.py,sha256=M1g9IchSEXREPxez5wsSX14Y1yyuAxXbdmXJNLrO00s,12969
+maialib/maiapy/sethares_dissonance.py,sha256=4PZEx_K5DLFOuDuq6ElKM0N97BjDT3XFX47lXeto-iU,13741
 maialib/maiapy/plots.pyi,sha256=nRNUQ9h9kjJHTdbQt4eXv933MOx7TIztIg-inThglB4,3620
 maialib/maiapy/plots.py,sha256=sg6W2OjzZNl8vEVy91URn1nFhfrlRHzXoBkvd4hoZXo,23680
-maialib/maiapy/sethares_dissonance.pyi,sha256=O8D_cYRPCE1K5Zw54ckg3I5frULcBGgs_di_bTOpuBU,3609
+maialib/maiapy/sethares_dissonance.pyi,sha256=T9rHlpeIao3gEelFJGa8690Tsd1DPzGmToMF_YJ3cNg,3828