Code

WIP update to use InterTypes#29

Code

Closed

p-stokes wants to merge 35 commits intomainAlgebraicJulia/SyntacticModels.jl:mainfrom pas/intertypeAlgebraicJulia/SyntacticModels.jl:pas/intertypeCopy head branch name to clipboard

+690-328

Commits

Commits on Dec 1, 2023

• Started making versions with InterTypes, amr.it and decapodes.it, and a corresponding test script intertype_examples.jl

  p-stokes

  committed
  883a465

• Fixed typos in decapodes.it and updated intertype_examples.jl

  p-stokes

  committed
  1c91145

• Removed redundant Header def from decapodes.it and added id field to amr.it version. Changed amr module name to AMR.

  p-stokes

  committed
  81d1d9c

• Added decapode parsing functions and test example for ASKEMDecaExpr with jsonread and jsonwrite

  p-stokes

  committed
  6f3df6f

Commits on Dec 4, 2023

• Started setting up src files to export the intertype structures. Started the uwd intertypes.

  p-stokes

  committed
  84a37dc

• uwd write and read test example working. needed to change write_json_model and readback in core_it.jl. readback currently won't work because intertypes parsing doesn't recognize the typeof variant …

  Show description for 361199c
  p-stokes

  committed
  361199c

• Added intertype version of SummationDecapode function and its helpers. Can now construct from an intertype version of DecaExpr. Still need to add SummationDecapode schema so it can be a field type …

  Show description for aa5cf1a
  p-stokes

  committed
  aa5cf1a

Commits on Dec 5, 2023

• Added intertype structs for SummationDecapode. It will load the intertype module but the SummationDecapode formation function is not yet producing an intertype one.

  p-stokes

  committed
  cd83f9d

• Added/updated functions to make intertype SummationDecapode. No longer uses Decapodes.jl. Copied in a few utilities from there. Edited readback function in core_it.jl

  p-stokes

  committed
  692a242

• Started factoring amr and uwd parts into source and test files, and updating the module and runtest files accordingly. Had to change the amr.it name within uwd.it from AMR to amr.

  p-stokes

  committed
  2d073e3

• Updated Project.toml

  p-stokes

  committed
  a4b61af

• Factored decapodes part into src and test. Again had to change AMR name to amr. Changed my_parse_decapode function name as well.

  p-stokes

  committed
  c0a34fb

• Started making intertype version for composite_models.

  p-stokes

  committed
  f6e4db1

Commits on Dec 6, 2023

• Updated composite_models_it src and test. Intertype version of oapply is not yet working; some possibly needed upstream Decapodes and Catlab functions are copied into src and parts of test are comm…

  Show description for eaa5c91
  p-stokes

  committed
  eaa5c91

• Started working on intertype version of ACSetSpec and other ADT code to finish the functionality in amr. Copied in commented version of old example code into test.

  p-stokes

  committed
  aed4d45

• Moved amr_it.jl contents into amr.jl to better view differences.

  p-stokes

  committed
  744bbca

• Moved contents of decapodes_it.jl and uwd_it.jl files to respective original files for easier diff view.

  p-stokes

  committed
  d1ad500

• Moved contents of composite_models_it.jl to original file for easier diff.

  p-stokes

  committed
  8c4b047

• Moved contents of _it_ex.jl files to their corresponding _examples.jl files for difference viewing.

  p-stokes

  committed
  f4fe83c

Commits on Dec 7, 2023

• deleted intertype versions of amr.jl and decapodes.jl

  p-stokes

  committed
  19f98d2

• Removed remaining intertype versions of src and test files for easier diff view.

  p-stokes

  committed
  233896f

• Removed unnecessary imports from test examples.

  p-stokes

  committed
  c2cc82b

• Updated Project.toml for docs.

  p-stokes

  committed
  bac39db

• Updated decapodes example doc.

  p-stokes

  committed
  0274d67

• Cleaned up imports and qualification of type names in src files. Removed references to Decapodes.jl in decapodes.jl.

  p-stokes

  committed
  37e6398

Commits on Dec 8, 2023

• Updated name qualifications in test examples.

  p-stokes

  committed
  bbcb53d

• Removed new id field from Header. Now same as before the PR. Will make new PR to add later if needed.

  p-stokes

  committed
  5a9f95b

Commits on Dec 11, 2023

• Made oapply workaround -- it_to_orig converts an intertype summation decapode to a Decapodes one, then Decapodes.Open can be used to compose. Still need to add reverse conversion.

  p-stokes

  committed
  7785c96

• Made coversion from Decapodes.SummationDecapode to intertype version. Updated remaining OpenDecapode function to oapply composite model and convert back to intertype.

  p-stokes

  committed
  6feef74

Commits on Dec 12, 2023

• Uncommented sm_write_json_model, 2nd write_json_model method and most uses in examples. jsonwrite in first method still not working for empty annotations, so those examples are still commented.

  p-stokes

  committed
  ab9a258

• Added clarifying comments in composite_models_examples.jl about fixes needed to make write_json_model and readback work.

  p-stokes

  committed
  6af6977

Commits on Dec 14, 2023

• Added acsetspec converter from ADTs version to intertype. Updated types in .it as needed. Load to AMR from expression examples now work. Need to update amr_to_string (and check other functions) to …

  Show description for cf77220
  p-stokes

  committed
  cf77220

• Fixed convert_pair_to_it and changed convert_val_to_it to handle QuoteNode. Need to update load from dict for ASKEModel and Typing and amr_to_string.

  p-stokes

  committed
  403b573

• Edited load Typing and ASKEModel from dict. Typing part requires Pairs of Strings for some examples. Also still need to fix amr_to_string and amr_to_expr.

  p-stokes

  committed
  dc77e68

• Corrected amr var name in amr_to_expr. Now, problem with amr_to_expr relates to intertype version of ACSetSpec is different format from ADTs. May want to convert back for expr or string. amr_to_str…

  Show description for e07fb29
  p-stokes

  committed
  e07fb29