Migrate from using QDefinitions for Data Definitions to using DataDefinition data type
#926
Closed
6 tasks done
Assignees
Comments
This was referenced Jul 20, 2018
This was referenced Jul 20, 2018
|
Hi @Mornix, what is the status of this issue for GamePhysics? |
|
@niazim3 Totally slipped through the cracks. Should be up shortly. |
Mornix
added a commit
that referenced
this issue
Jul 31, 2018
szymczdm
added a commit
that referenced
this issue
Jul 31, 2018
Use DataDefinition in GamePhys (#926)
niazim3
added a commit
that referenced
this issue
Aug 2, 2018
…Data, Data', Theory that were causing import cycles with move (#926)
JacquesCarette
pushed a commit
that referenced
this issue
Aug 8, 2018
* Work In Progress * Changes to previous commit as discussed in comments within the commit * W.I.P Update with Section as record type and removal of HasShortName instance of Contents * W.I.P adjusted relToQD and convertRel to take Label * reduced errors in Utils.hs; still breaking (see #695 for error message and potential solutions) * added Maybe Label field to RelationConcept * update RefFromType temporarily to be the same as makeRef * started adding labels to get past errors resulting from missing Labels * continued work on adding labels to example * made makeRA' and makeRA'' constructors; updated more examples to not break * added labels to SSP references * fixed typos (whoops) * worked on getting past SSP when make is run for Label updates * broken; added LabelledContent as a SecCons; started to implement datCon as LabelledContent instead of Contents * updated some definitions to be of correct types; inlined labelled will need to be pulled out * continued updating Contents use to LablledContent use * made Label an instance of Referable class to allow use of just labels for referencing (removes some uses of missingP hack) * updated SSP for PSD as labelledcontents * continued work on DataConstraints section update; fixed some typos; added a crucial(?) fixme as a reminder * created Labels.hs file for SWHS to avoid import cycles created from attempt to inter-reference TM and IM (removes another hack) * continued work on labels/referencing for SWHS; new issues will be opened soon with regard to Fixmes * removed use of refFromType that was causing errors from expecting Contents to have a Label * work on SWHS continued; some errors removed that resulted from previous merge * updated traceGIntro to not include text that is not related to SRS content * WIP: clearing errors from SWHS * finally breaks outside of SWHS (with uncomment of horrible swhsIMods' hack) * started work on NoPCM; will be pausing work on this branch until yuzhi branch is merged in * removed redundant imports; fixing up implementation to break where it was breaking before merge of master into this branch; adding labels to SSP * removed decrepit code from SSP body; cleaned up import lists; working on getting make to run past SWHS * removed duplicate function from SWHS; make now breaks in GamePhysics * GamePhysics Tmods and References updated for labels * GamePhysics Imodels updated for labels * shortened lines of code in GamePhysics Body * updating NoPCM and SWHS for label updates * continuing work on label integration; breaking in GlassBR * removed definition of ref from GlassBR TMods * continued work on GlassBR * continued work on getting examples to run through use of LabelledContent instead of Contents * replaced testing1 function use with that of gbrIMods for referencing purposes * GlassBR broken due to TheoryModels and referencing infrastructure * temporarily commented out line causing error in GlassBR; cleaned up imports; moving onto SSP example * cleaned up NoPCM asssumptions; Examples compile * worked on rendering labels; still need to view if implementation works * general definition implementation updated for LabelledContent type instead of Contents * cleaned up some examples; updated some functions for Label updates * running make now gets to logs after GlassBR is completely commented out in makefile * removed appearance of fixmelabel0 in all logs; hardcoded missing "Table:" so that logs reduce slightly * created DataDefinitions for HGHC example; no more occurrences of "fixmelabel4" in logs * updated Tiny stable for changes made in previous commit * updated Assumptions section to expect [LabelledContent] instead of [Contents]; need to determine why lay is being used instead of lay prime * removed find' and acroTest * reset makefile to not have commented out code * updated examples for change made to assumpF; "fixmelabel8" no longer shows up in logs * dataDefnF now expects [LabelledContent] instead of [Contents]; attempting to determine how to remove presence of "fixmelabel3" from logs * removed hardcoded "LC"s as discussed in previous commit comment discussions; made IOrgSec accept a label instead of a section for referencing; removed accidentally added wreq.png file * merge issue321 branch into addLabels * removed errors and warnings so that original errors show up * updated accessContents definitions as suggested * started use of HasMaybeLabel instead of HasLabel for LabelledContent; broken * made updates in files (some makeRef -> makeRefSec) * updated definition of ModRow to use LabelledContent instead of Contents; mkIMField updated for these changes * finished updated functions for new ModRow definition; occurrences of "fixmelabel3" in logs has reduced * makefile revert * updated inModel section generation to use LabelledContents; further reduces appearance of "fixmelabel3" in logs * removed all appearances of "fixmelabel3" in logs * removed missingP hack; relates to #374 * Fix the bug in symbol collecting. * fixing errors that resulted from mrege; currently breaking in GlassBR * GlassBR updated for merged implementation; working on compiling SWHS successfully * multiple fixmes and some obsolete code removed from SWHS; SWHS now compiles; working on NoPCM * NoPCM fixed; few fixmes worked on; working on Tiny example * tiny example compiles; moving onto fixing SSP * SSP example compiles; working on GamePhysics updates * examples now compile * removed datadefn from Drasil * updated stable to be the same as it was before the merge of PR #962; removed some mkEmptyLabels from implementation * small implementation fixes suggested in pr #962 * removed some mkEmptyLabel instances * W.I.P. correcting generated * removed some more mkEmptyLabel instances from implementation * mkEmptyLabel removed from reldefn * [Small PR] Improved GlassBR Code (#965) * Moved functional_requirements_req6_pulledList as per #902 * Changed underscores in function names to camelCase in Body * Changed is_safe1 and is_safe2 to is_safePb and is_safeLR * removed a series of warnings in Drasil * Attempt at assumption referencing in Chipmunk and make Glass compile * replaced some empty labels with an UnlabelledContent where appropriate * removed enumitem from stable that was accidentally reinserted (originally removed in PR #958) * Creating mkRawLC to append prefixes to labels * Finished mkRawLC * removed decrepit RefAdd fields from RawContents * fixed error; replaced one more instance of mkEmptyLabel * Implementing mkRawLC for LikelyChanges * Update stable? * Removed '_Label' from labels in SWHS * updated tiny stable equation labels, removed another mkEmptyLabel * made labels of sections not have the same refadd and shortname; reduces "Sec:"-related discrepancies in the logs; reintroduced repUnd hack since its removal was causing unrelated discrepancies * updated definition of ddefn' and mkRawLC; tiny log now empty * updated Definitions.hs to use mkRawLC more; updated intro in CP to match that of manual version * updated stable GamePhysics Assumptions to remove redundant 'A's in labels of some assumptions * updated labels in TMods and IMods for GamePhysics to match stable * slightly cleaned up implementation of mkRawLC * Fixed Chipmunk Assumption links * updated stable SSP netforce labels to match generated; fixed error from merge and removed some duplication from chipmunk * W.I.P. reintroducing repUnd * displays updated in stable to the desired output as mentioned in #970 * more updates in stable SSP for changes in label display * reduced discrepancies in SSP_log * Reduced Chipmunk log significantly * Removed space in stable * trivial updates to NoPCM SRS * some trivial updates to stable; removal of the use of UID for labels for Requirement and Change LabelledContents * Fix the symptom of #891. It does not fix the issue of ExprRelat itself, but may result in more relToQD being removed, so that the issue may become less important. * updated stable for trivial updates in NoPCM stable * Finished emptying Chipmunk log * Updated SSP stable with equation labels * more trivial updates to stable for NoPCM * removed reldefn from Drasil completely; insuccessfully attempted to run GlassBR * 1. improve error message for when things fail. 2. add defined_fun to definition too, just in case. * Fixing SWSW log * Make RelationConcept have a full Label (this is a bit of a hack, but since RelationConcept is likely to disappear, not so bad). Propagate this change throughout the code and the examples. Still not quite right, but it feels closer. * some comments as to next steps * cleaned up implementation of mkRawLC by creating setLabel function; implemented a function's use from makeRef; removes discrepancies occurring from underscores that were not being replaced with periods upon makeRef use * removed refAdd field from Goal and PSD * moved DType and makePairs for use in shortname setting hack; removed Data, Data', Theory that were causing import cycles with move (#926) * implemented extra space after some shortname acronyms as mentioned in #970; logs need cleaning * Corrected melfFrac issue in SWHS * Updated Chipmunk stable * Updated SSP stable * Updated NoPCM stable except for 'Sec:' issue * Generating different prefixes for Functional/Non-Functional requirements * no longer exports lbl field for Goal or PhysSystDesc * NoPCM stable updated for trivial fixes; refaddresses now no longer depend on UIDs of chunks for refaddresses * minor typo fix * Correcting SWHS log * GlassBR compiles - updated Makefile and added missing quantities to gbInputs * added RefType as a field to Label; feels like a very roundabout and messy implementation that I'd like some feedback on before propagating changes to remaining chunks * Started clearing GlassBR log * Fixed trivial diffs in GlassBR log * label constructor created for AssumpChunk Labels; generated HTML list of assumptions currently has prepended A: that was asked about in issue #970 * SWHS log fixed * reverted changes that caused A: to be appended to the shortname upon creation of label; fixed typo in NoPCM * replaced mkLabelRA'' with mkLabelSame as suggested * Updating stable for NoPCM log * NoPCM stable update * Completed NoPCM stable update * implemented newer design implementation; <<loop>> error is back; looking into it * replaced mkLabelRA'' with mkLabelSame as suggested * implemented newer design implementation; <<loop>> error is back; looking into it * Fix #961 loop issue (again). This had a different cause * Remove tab characters and fix whitespace * updated package version numbers and dependencies; working on logs * removed obsolete mkLabelRA * removed duplicate tags that were being printed with some refaddresses; continue to clear log * removed unitToEmptyS function accidentally added * workaround for traceability infrmation in reference addresses * shortnames displayed with acronyms and spaces when appropriate (#970) * GlassBR DDs' shortnames now appear in traceability matrices * trivial updates made to stable versions of examples * GlassBR now generates * Fixed some referencing in SWHS and NoPCM * Removed warnings * R6 in glassbr now displayed in output; has a working link to it as well * Removed warnings * added reftype as a field to Label as a hack; clears logs; ready for merge to master * Fixed GlassBR inputs hack * Minor updates to Makefile
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Data definitions should be built using actual
DataDefinitions instead of (what will eventually be) the simpler datatypeQDefinition. In 3b2993c#diff-d6f0b4483a86f614fa7fbae4e27fff46,DataDefinitions for GlassBR were created (this example specifically because the yuzhi branch had not been merged in by that time and it was meant for testing the data type).#869 can be used as a guide on actually using the new lists of
DataDefinitions (i.e. passing them into theSystemInformation).As mentioned in #747, the remaining examples should shift from using
QDefintiions toDataDefinitions. Please check off your task as it is completed.mkDataDeftomkQDor something similar, as it builds aQDefinition@Mornix and @deviprasad135, if there are other issues that are higher priority, please feel free to re-assign the examples to myself, @elwazana, or @samm82.
The text was updated successfully, but these errors were encountered: