- 
          
- 
                Notifications
    You must be signed in to change notification settings 
- Fork 82
Add API functions for the other kinds of matrixes that a CRN ODE system can be factored into #1134
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
          
     Merged
      
      
    
  
     Merged
                    Changes from 25 commits
      Commits
    
    
            Show all changes
          
          
            37 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      e3c9d33
              
                init
              
              
                vyudu 17d1cd5
              
                implement functions
              
              
                vyudu 9e23705
              
                tests
              
              
                vyudu f8df438
              
                exports
              
              
                vyudu 389d09a
              
                cleanup
              
              
                vyudu 7d6cbf5
              
                fix test
              
              
                vyudu 4922561
              
                fix tesst
              
              
                vyudu 536a50d
              
                fix test
              
              
                vyudu 835b4ff
              
                rm from NetworkProperties
              
              
                vyudu b89329a
              
                Merge remote-tracking branch 'origin/master' into add-matrices
              
              
                vyudu 4a691b4
              
                comment out stability tests
              
              
                vyudu 211ac81
              
                update docstrings
              
              
                vyudu 3bdf298
              
                up
              
              
                vyudu 3128628
              
                up
              
              
                vyudu b921fed
              
                Fix docstring
              
              
                vyudu c82c80e
              
                add comment
              
              
                vyudu fcab9c3
              
                Merge branch 'master' into add-matrices
              
              
                vyudu cf89a29
              
                test fix
              
              
                vyudu 77b606f
              
                up
              
              
                vyudu e5eec18
              
                Merge remote-tracking branch 'vyudu/add-matrices' into add-matrices
              
              
                vyudu 6e68436
              
                fix test
              
              
                vyudu 7487e0d
              
                Merge remote-tracking branch 'origin/master' into add-matrices
              
              
                vyudu b3dce88
              
                format
              
              
                vyudu b777518
              
                up
              
              
                vyudu a782851
              
                fix
              
              
                vyudu 32deeea
              
                up
              
              
                vyudu 3f1d1ca
              
                up
              
              
                vyudu ce8e110
              
                fixes
              
              
                vyudu 8551454
              
                up
              
              
                vyudu a6d924a
              
                up
              
              
                vyudu b8e3255
              
                Update test/runtests.jl
              
              
                isaacsas 2d1c9c8
              
                Merge remote-tracking branch 'origin/master' into pr/1134
              
              
                isaacsas aa12d24
              
                revert to return , add docstrings
              
              
                vyudu b823256
              
                Merge branch 'add-matrices' of github.com:vyudu/Catalyst.jl into add-…
              
              
                vyudu bfe849f
              
                modify docstring
              
              
                vyudu 6c25931
              
                update Project.toml
              
              
                vyudu 5c9bf74
              
                Merge branch 'master' of https://github.com/SciML/Catalyst.jl into ad…
              
              
                vyudu File filter
Filter by extension
Conversations
          Failed to load comments.   
        
        
          
      Loading
        
  Jump to
        
          Jump to file
        
      
      
          Failed to load files.   
        
        
          
      Loading
        
  Diff view
Diff view
There are no files selected for viewing
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
      
      Oops, something went wrong.
        
    
  
      
      Oops, something went wrong.
        
    
  
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be
Numand not the unwrapped type?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it has to, doesn't seem like it's actually possible to have zeros in this matrix if the eltype is
BasicSymbolicThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't it by type
Any?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is that better than being
Num? I assumed more specific was betterThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't want to return mixtures of Nums and non-Nums across different methods, so we should not re-wrap internal symbolics.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually this creates some issues for the sparse method (can't really do any arithmetic with a
SparseMatrixCSC{Any, T}since zero(Any) is undefined). WouldUnion{Float64, BasicSymbolic}be okay? If not it might just be better to define two functions, one symbolic and one numericThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you want to internally use Num I guess that is ok, but yeah, we should unwrap before returning to users for consistency.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about returning a
Unionas the element type?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually that doesn't work, nevermind, when you find the Laplacian matrix (D*K) type inference infers its eltype as Any anyway. Since it's the sparse matrix support that's causing the issue I think it might just be better to not allow the sparse kwarg for now
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Alright, I guess just stick with
Num. But please add documentation about this and why it is needed to the function doctrings.