Apply Ref2 to Some Chunks #1052
Merged
Conversation
This file contains 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
JacquesCarette
approved these changes
Nov 23, 2018
|
Merged. Should I delete the branch, or will you continue to use this one for more changes (i.e. other case studies)? |
|
Yes, I will make changes to other cases too. This branch will be ready to be merged to master tomorrow. |
|
Great. |
JacquesCarette
pushed a commit
that referenced
this pull request
Nov 27, 2018
…zations were Made (#1063) * Apply ConceptDomain to CI. * Collect CI from DocDesc. * Try new structure on SWHS. * Fill conceptDomain for CIs in drasil-data. * Add conceptDomain for GlassBR. * Add more conceptDomains for CIs. * Add conceptDomain to some chunks and add a new CI sec. * Try to implement CI to some chunks. * Reimplement Concept domain for CIs. * Add CI field to AssumpChunk. * Add CI to Assumpchunk and dataDef. * Add CI field for Section. * Add CI field for Instance Model. * And CI to Theory model. * Add CI for General Definition. * Modify term description for Glass. * Move IdeaDicts to drasil-lang. * Rearrange module to make Data.Drasil.IdeaDicts exposed from drasil-lang. * Remove implementation of acronmys. * Implement NamedIdea and CommomIdea class for AssumpChunk. * Remove CI from Section. * Add CI to Citation. * Remove some redundant definitions. * Try to implement new Reference2. * Try apply on assumptions. * Optimize the data type. * ConceptInstance uses Ref2 (#1051) * Update RefProg language and renderer. * Silence some warnings. * Add renderRef to Referable and have makeRef2 use that. Use snref for Ref2 in TeX printer. * Use makeRef2 for ConceptInstance in all examples. * Apply Ref2 to Some Chunks (#1052) * Update RefProg language and renderer. * Silence some warnings. * Add rProg to Referable and have makeRef2 use that. Use snref for Ref2 in TeX printer. * Use makeRef2 for ConceptInstance in GlassBR * Turn all references of AssumpChunk to use makeRef2. * Turn TM related references to use makeRef2. * Make GenDef to use new ref2, but there is no GD for GlassBr. * Turn DD related references to use new ref2. * Turn IM related references to use new ref2. * Make RefProg for LabelledContent. * Implement RefProg for Citation. * Apply new conceptDomain for Citation. * Turn all possible-changed references to use Ref2 in every case (#1053) * Update RefProg language and renderer. * Silence some warnings. * Add rProg to Referable and have makeRef2 use that. Use snref for Ref2 in TeX printer. * Use makeRef2 for ConceptInstance in GlassBR * Turn all references of AssumpChunk to use makeRef2. * Turn TM related references to use makeRef2. * Make GenDef to use new ref2, but there is no GD for GlassBr. * Turn DD related references to use new ref2. * Turn IM related references to use new ref2. * Make RefProg for LabelledContent. * Implement RefProg for Citation. * Apply new conceptDomain for Citation. * Use Ref2 in GamePhysics. * Use Ref2 in NoPCM. * Use Ref2 in SSP. * Use Ref2 in SWHS. * Fix couple errors (#1055) * Update RefProg language and renderer. * Silence some warnings. * Add rProg to Referable and have makeRef2 use that. Use snref for Ref2 in TeX printer. * Use makeRef2 for ConceptInstance in GlassBR * Turn all references of AssumpChunk to use makeRef2. * Turn TM related references to use makeRef2. * Make GenDef to use new ref2, but there is no GD for GlassBr. * Turn DD related references to use new ref2. * Turn IM related references to use new ref2. * Make RefProg for LabelledContent. * Implement RefProg for Citation. * Apply new conceptDomain for Citation. * Use Ref2 in GamePhysics. * Use Ref2 in NoPCM. * Use Ref2 in SSP. * Use Ref2 in SWHS. * Fix some errors which accidently applied ref2 on label. * Turn IM1 to DD for SSP and change all related references and modify stable to match. * Turn TM1 to DD1. * Turn IM3 to DD but still keep IM3 in IM section as a placeholder. * GlassBR get rid of all the cyclic importing issues. * Turn two DDs to GMs, but leave those two DDs as well because they have derivations. * Remove those two DDs and remove some label references. * Remove more label references. * Reference2 should not store a UID (except in Deferred). So making these does not need a HasUID. Triggered by removing use of mkRefFrmLbl in showTables. * remove some warnings. Make exports from Reference explicit. Remove some unused things from Reference (more to go). * Turn a TM to DD. * Do not export makeRef2, just makeRef2S. It was not needed anyways. * Differentiation between Internal references (with a full RefProg) and a Citation. Because LaTeX needs to know. And it is a (somehow) semantic difference. Citation is not used yet, that will be the next phase. * Change some references from makeRefS to makeCite in GlassBR, and it worked. Without any changes needed to stable even. So this is definite forward progress. * two constructors for make InstanceModels were never used, so removed them. * Successful surgery: all InstanceModel now have a Citation, rather than a Reference field. These mean different things in Drasil. Some noise is introduced during the transition, but the extra combinators can be removed later. Also, need to split Classes into yet more pieces to deal with import cycles (can be done later too). * implement URI/external references. These exist in SWHS (in the old Reference). This is the first step in using Referenc2 for TheoryModels. * Get rid of all makerefs to use makeRef2S or makecitation. * Match stable * Create makeCiteS and makeRef2. * Changes for GlassBR. * Fix the errors for GlassBR. * Make changes for NOPCM. * Make changes for NoPCM. * Make changes for SWHS. * More changes. * Modify DataDefinition Structure. * switch TheoryModel to Reference2. A few hacks along the way to get there, but will be easy to deal with later. * Modify structure for General Definition. * Remove some warnings. * Remove more warnings. * Try to comment out makeRef and makeRefS to get rid of all the use of them; Fix almost everything except the Unital.hs in GlassBR references assumptions.hs; This removing is faked. * recover the fake removing makeRefS. * Recover makeRef and makeRefS importing. * Match most of the stables and found an error in SWHS and fixed it. * Fix the error in SWHS again and match the stable. * Match the final stable. * Fix the parse errpr. * Remove two label references.
JacquesCarette
pushed a commit
that referenced
this pull request
Nov 28, 2018
* Apply ConceptDomain to CI. * Collect CI from DocDesc. * Try new structure on SWHS. * Fill conceptDomain for CIs in drasil-data. * Add conceptDomain for GlassBR. * Add more conceptDomains for CIs. * Add conceptDomain to some chunks and add a new CI sec. * Try to implement CI to some chunks. * Reimplement Concept domain for CIs. * Add CI field to AssumpChunk. * Add CI to Assumpchunk and dataDef. * Add CI field for Section. * Add CI field for Instance Model. * And CI to Theory model. * Add CI for General Definition. * Modify term description for Glass. * Move IdeaDicts to drasil-lang. * Rearrange module to make Data.Drasil.IdeaDicts exposed from drasil-lang. * Remove implementation of acronmys. * Implement NamedIdea and CommomIdea class for AssumpChunk. * Remove CI from Section. * Add CI to Citation. * Remove some redundant definitions. * Try to implement new Reference2. * Try apply on assumptions. * Optimize the data type. * ConceptInstance uses Ref2 (#1051) * Update RefProg language and renderer. * Silence some warnings. * Add renderRef to Referable and have makeRef2 use that. Use snref for Ref2 in TeX printer. * Use makeRef2 for ConceptInstance in all examples. * Apply Ref2 to Some Chunks (#1052) * Update RefProg language and renderer. * Silence some warnings. * Add rProg to Referable and have makeRef2 use that. Use snref for Ref2 in TeX printer. * Use makeRef2 for ConceptInstance in GlassBR * Turn all references of AssumpChunk to use makeRef2. * Turn TM related references to use makeRef2. * Make GenDef to use new ref2, but there is no GD for GlassBr. * Turn DD related references to use new ref2. * Turn IM related references to use new ref2. * Make RefProg for LabelledContent. * Implement RefProg for Citation. * Apply new conceptDomain for Citation. * Turn all possible-changed references to use Ref2 in every case (#1053) * Update RefProg language and renderer. * Silence some warnings. * Add rProg to Referable and have makeRef2 use that. Use snref for Ref2 in TeX printer. * Use makeRef2 for ConceptInstance in GlassBR * Turn all references of AssumpChunk to use makeRef2. * Turn TM related references to use makeRef2. * Make GenDef to use new ref2, but there is no GD for GlassBr. * Turn DD related references to use new ref2. * Turn IM related references to use new ref2. * Make RefProg for LabelledContent. * Implement RefProg for Citation. * Apply new conceptDomain for Citation. * Use Ref2 in GamePhysics. * Use Ref2 in NoPCM. * Use Ref2 in SSP. * Use Ref2 in SWHS. * Fix couple errors (#1055) * Update RefProg language and renderer. * Silence some warnings. * Add rProg to Referable and have makeRef2 use that. Use snref for Ref2 in TeX printer. * Use makeRef2 for ConceptInstance in GlassBR * Turn all references of AssumpChunk to use makeRef2. * Turn TM related references to use makeRef2. * Make GenDef to use new ref2, but there is no GD for GlassBr. * Turn DD related references to use new ref2. * Turn IM related references to use new ref2. * Make RefProg for LabelledContent. * Implement RefProg for Citation. * Apply new conceptDomain for Citation. * Use Ref2 in GamePhysics. * Use Ref2 in NoPCM. * Use Ref2 in SSP. * Use Ref2 in SWHS. * Fix some errors which accidently applied ref2 on label. * Turn IM1 to DD for SSP and change all related references and modify stable to match. * Turn TM1 to DD1. * Turn IM3 to DD but still keep IM3 in IM section as a placeholder. * GlassBR get rid of all the cyclic importing issues. * Turn two DDs to GMs, but leave those two DDs as well because they have derivations. * Remove those two DDs and remove some label references. * Remove more label references. * Reference2 should not store a UID (except in Deferred). So making these does not need a HasUID. Triggered by removing use of mkRefFrmLbl in showTables. * remove some warnings. Make exports from Reference explicit. Remove some unused things from Reference (more to go). * Turn a TM to DD. * Do not export makeRef2, just makeRef2S. It was not needed anyways. * Differentiation between Internal references (with a full RefProg) and a Citation. Because LaTeX needs to know. And it is a (somehow) semantic difference. Citation is not used yet, that will be the next phase. * Change some references from makeRefS to makeCite in GlassBR, and it worked. Without any changes needed to stable even. So this is definite forward progress. * two constructors for make InstanceModels were never used, so removed them. * Successful surgery: all InstanceModel now have a Citation, rather than a Reference field. These mean different things in Drasil. Some noise is introduced during the transition, but the extra combinators can be removed later. Also, need to split Classes into yet more pieces to deal with import cycles (can be done later too). * implement URI/external references. These exist in SWHS (in the old Reference). This is the first step in using Referenc2 for TheoryModels. * Get rid of all makerefs to use makeRef2S or makecitation. * Match stable * Create makeCiteS and makeRef2. * Changes for GlassBR. * Fix the errors for GlassBR. * Make changes for NOPCM. * Make changes for NoPCM. * Make changes for SWHS. * More changes. * Modify DataDefinition Structure. * switch TheoryModel to Reference2. A few hacks along the way to get there, but will be easy to deal with later. * Modify structure for General Definition. * Remove some warnings. * Remove more warnings. * Try to comment out makeRef and makeRefS to get rid of all the use of them; Fix almost everything except the Unital.hs in GlassBR references assumptions.hs; This removing is faked. * recover the fake removing makeRefS. * Recover makeRef and makeRefS importing. * Match most of the stables and found an error in SWHS and fixed it. * Fix the error in SWHS again and match the stable. * Match the final stable. * Fix the parse errpr. * Remove two label references. * Fix the error made by removing two references.
JacquesCarette
pushed a commit
that referenced
this pull request
Dec 5, 2018
…1072) * Apply ConceptDomain to CI. * Collect CI from DocDesc. * Try new structure on SWHS. * Fill conceptDomain for CIs in drasil-data. * Add conceptDomain for GlassBR. * Add more conceptDomains for CIs. * Add conceptDomain to some chunks and add a new CI sec. * Try to implement CI to some chunks. * Reimplement Concept domain for CIs. * Add CI field to AssumpChunk. * Add CI to Assumpchunk and dataDef. * Add CI field for Section. * Add CI field for Instance Model. * And CI to Theory model. * Add CI for General Definition. * Modify term description for Glass. * Move IdeaDicts to drasil-lang. * Rearrange module to make Data.Drasil.IdeaDicts exposed from drasil-lang. * Remove implementation of acronmys. * Implement NamedIdea and CommomIdea class for AssumpChunk. * Remove CI from Section. * Add CI to Citation. * Remove some redundant definitions. * Try to implement new Reference2. * Try apply on assumptions. * Optimize the data type. * Update RefProg language and renderer. * Silence some warnings. * Add rProg to Referable and have makeRef2 use that. Use snref for Ref2 in TeX printer. * Use makeRef2 for ConceptInstance in GlassBR * Turn all references of AssumpChunk to use makeRef2. * Turn TM related references to use makeRef2. * Make GenDef to use new ref2, but there is no GD for GlassBr. * Turn DD related references to use new ref2. * Turn IM related references to use new ref2. * Make RefProg for LabelledContent. * Implement RefProg for Citation. * ConceptInstance uses Ref2 (#1051) * Update RefProg language and renderer. * Silence some warnings. * Add renderRef to Referable and have makeRef2 use that. Use snref for Ref2 in TeX printer. * Use makeRef2 for ConceptInstance in all examples. * Apply new conceptDomain for Citation. * Apply Ref2 to Some Chunks (#1052) * Update RefProg language and renderer. * Silence some warnings. * Add rProg to Referable and have makeRef2 use that. Use snref for Ref2 in TeX printer. * Use makeRef2 for ConceptInstance in GlassBR * Turn all references of AssumpChunk to use makeRef2. * Turn TM related references to use makeRef2. * Make GenDef to use new ref2, but there is no GD for GlassBr. * Turn DD related references to use new ref2. * Turn IM related references to use new ref2. * Make RefProg for LabelledContent. * Implement RefProg for Citation. * Apply new conceptDomain for Citation. * Use Ref2 in GamePhysics. * Use Ref2 in NoPCM. * Use Ref2 in SSP. * Use Ref2 in SWHS. * Add trace table and refby table and traverse DocDesc to get the references. * Turn all possible-changed references to use Ref2 in every case (#1053) * Update RefProg language and renderer. * Silence some warnings. * Add rProg to Referable and have makeRef2 use that. Use snref for Ref2 in TeX printer. * Use makeRef2 for ConceptInstance in GlassBR * Turn all references of AssumpChunk to use makeRef2. * Turn TM related references to use makeRef2. * Make GenDef to use new ref2, but there is no GD for GlassBr. * Turn DD related references to use new ref2. * Turn IM related references to use new ref2. * Make RefProg for LabelledContent. * Implement RefProg for Citation. * Apply new conceptDomain for Citation. * Use Ref2 in GamePhysics. * Use Ref2 in NoPCM. * Use Ref2 in SSP. * Use Ref2 in SWHS. * Fix the left errors. * Remove useless constraints. * Try to implement the refBy but found a problem. * Fix couple errors (#1055) * Update RefProg language and renderer. * Silence some warnings. * Add rProg to Referable and have makeRef2 use that. Use snref for Ref2 in TeX printer. * Use makeRef2 for ConceptInstance in GlassBR * Turn all references of AssumpChunk to use makeRef2. * Turn TM related references to use makeRef2. * Make GenDef to use new ref2, but there is no GD for GlassBr. * Turn DD related references to use new ref2. * Turn IM related references to use new ref2. * Make RefProg for LabelledContent. * Implement RefProg for Citation. * Apply new conceptDomain for Citation. * Use Ref2 in GamePhysics. * Use Ref2 in NoPCM. * Use Ref2 in SSP. * Use Ref2 in SWHS. * Fix some errors which accidently applied ref2 on label. * Turn IM1 to DD for SSP and change all related references and modify stable to match. * Turn TM1 to DD1. * Turn IM3 to DD but still keep IM3 in IM section as a placeholder. * GlassBR get rid of all the cyclic importing issues. * Turn two DDs to GMs, but leave those two DDs as well because they have derivations. * Remove those two DDs and remove some label references. * Remove more label references. * Reference2 should not store a UID (except in Deferred). So making these does not need a HasUID. Triggered by removing use of mkRefFrmLbl in showTables. * remove some warnings. Make exports from Reference explicit. Remove some unused things from Reference (more to go). * Turn a TM to DD. * Do not export makeRef2, just makeRef2S. It was not needed anyways. * Differentiation between Internal references (with a full RefProg) and a Citation. Because LaTeX needs to know. And it is a (somehow) semantic difference. Citation is not used yet, that will be the next phase. * Change some references from makeRefS to makeCite in GlassBR, and it worked. Without any changes needed to stable even. So this is definite forward progress. * two constructors for make InstanceModels were never used, so removed them. * Successful surgery: all InstanceModel now have a Citation, rather than a Reference field. These mean different things in Drasil. Some noise is introduced during the transition, but the extra combinators can be removed later. Also, need to split Classes into yet more pieces to deal with import cycles (can be done later too). * implement URI/external references. These exist in SWHS (in the old Reference). This is the first step in using Referenc2 for TheoryModels. * Get rid of all makerefs to use makeRef2S or makecitation. * Match stable * Create makeCiteS and makeRef2. * Changes for GlassBR. * Fix the errors for GlassBR. * Make changes for NOPCM. * Make changes for NoPCM. * Make changes for SWHS. * More changes. * Modify DataDefinition Structure. * switch TheoryModel to Reference2. A few hacks along the way to get there, but will be easy to deal with later. * Modify structure for General Definition. * Remove some warnings. * Remove more warnings. * Try to comment out makeRef and makeRefS to get rid of all the use of them; Fix almost everything except the Unital.hs in GlassBR references assumptions.hs; This removing is faked. * recover the fake removing makeRefS. * Recover makeRef and makeRefS importing. * Match most of the stables and found an error in SWHS and fixed it. * Fix the error in SWHS again and match the stable. * Match the final stable. * Revert RefBy field implementation. * Initial design. * Apply UID to more chunks, but need to be verified. * Add UID to Section. * Modify the makeRef2 to has HasUID class. * Add UID field to Reference2. * Start fixing fixme. * Fix fixme #1. * Fix fixme #2. * Fix fixme #3. * Make some modification based on feedback, expr is hard to name. * Fix fixme #4. * Change structure for Section. * Modify structure for LabelledContent. * Remove UID field from LabelledContent. * Fix more in exmaples. * Constraint Referable class. * Implement new Ref2 constructor. * Remove fixme from makeURI. * fix an error. * Add four maps to ChunkDB. * Try to implement Refby to o DD section. * Implement Refby to DD, TM, IM and GD. * Fix stable with some references in RefBy field. * Bring references back to append to the end of assumption sentence. * Try to implement a Traceability structure. * Put Assumption Map in to ChunkDB. * Tryp to implement the Traceability matrix. * Fix bug in generating tracyMatrix; the order of the input doesn't matter. * Implement a big trace Matrix to every case except SSP. * Fix the dot dot error. * Add ConceptInstanceMap to ChunkDB. * Match stable for now so that further changes can be observed well. * Update all cases to use the new structure of Requirement section. * Change to use new structures to generate likely and unlikely change section. * Found the problem and fix. * Try to change the structure for LikelyChange section. * Test collecting references from reqs and likelyChanges. * Add section map to ChunkDB. * Fix an error but there is still a bug. * Fixed the collecting setions bug. * Add LabelledContent Map to CHunkDB. * Fill all the reference things. * Match stable. * Change generating matrix function to be better. * Fix the error.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In this PR, the following things were done.
DataDefinition,InstanceModel,TheoryModel,GeneralDefinition,CitationandLabelledContent.