Skip to content
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

PG-2.13 #310

Merged
merged 99 commits into from
Jul 25, 2017
Merged
Changes from 2 commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
ef36adb
Added a first past at allowing units to be added programatically.
goehle Jan 17, 2016
7569295
Removed automatic pluralization. Its too hard.
goehle Jan 18, 2016
5bf76d8
Changed things around so that the units hashes are local to the problem.
goehle Jan 23, 2016
f5fa19d
Update documentation
goehle Jan 23, 2016
01b80c1
remove extra code.
goehle Jan 23, 2016
0ce48f4
remove extra code v2
goehle Jan 23, 2016
9477345
Merge branch 'develop' of https://github.com/openwebwork/pg into newunit
goehle Jan 27, 2016
9208703
Initial commit for Selenium testing harness.
goehle Jan 27, 2016
03be0a1
wrong place.
goehle Jan 27, 2016
8e1b875
changes to the skel
goehle Jan 28, 2016
ee18113
Merge branch 'develop' of https://github.com/openwebwork/pg into newunit
goehle Jan 29, 2016
556c142
Adding selenium tests.
goehle Jan 30, 2016
5ed6074
Merge branch 'newunit' of https://github.com/goehle/pg into newunit
goehle Jan 30, 2016
c02906d
Removed unwanted files and cleaned up variable decs. Tests still bro…
goehle Jan 31, 2016
f1c1cd9
Cleaned up and fixed tests.
goehle Feb 1, 2016
9f65593
Added ability to override testing uname and pwd.
goehle Feb 2, 2016
a44fd11
Removing tests.
goehle Feb 14, 2016
9d29397
localizaton changes.
goehle Mar 22, 2016
23dc77a
polishing localizatoins.
goehle Mar 31, 2016
a72087f
proofreading changes.
goehle Mar 31, 2016
78b0e75
Change version back
goehle Apr 20, 2016
6de4790
Merge branch 'release/2.12' into develop
goehle Apr 20, 2016
ce2d355
Merge branch 'release/2.12' of https://github.com/openwebwork/pg into…
goehle May 17, 2016
61def70
Create ability to add new units to problem before calling NumberWithU…
mgage May 19, 2016
1811a55
Merge pull request #3 from mgage/newunit
goehle May 19, 2016
d78b2c9
Merge pull request #268 from goehle/newunit
mgage May 19, 2016
f56cf8a
Merge branch 'develop' of https://github.com/openwebwork/pg into potups
goehle May 19, 2016
779fad2
Remove xXx debug
goehle May 20, 2016
32efa52
Merge pull request #273 from goehle/potups
mgage May 20, 2016
b17508c
Add the macros for communication with a remote R server
cubranic Jun 8, 2015
a1477c9
Allow for question writer to specify the width and height of the image
cubranic May 30, 2016
29a4a8a
Merge pull request #214 from cubranic/rserve-macro
goehle May 31, 2016
78c41e6
Fix dumb typo in init subroutine of PG.pl
mgage Jun 6, 2016
3777eb7
A better fix for the localization problem. Requires a change in webw…
mgage Jun 7, 2016
a1c88b3
Merge pull request #276 from mgage/develop_hotfix
goehle Jun 17, 2016
1bcebc0
Merge pull request #277 from mgage/develop_localize2
goehle Jun 17, 2016
bc2cdea
Fixed a bug with pg where the line numbers of errors were sometimes w…
goehle Aug 4, 2016
e34621f
Merge pull request #279 from goehle/numberingbug
mgage Aug 20, 2016
bb29e9c
Don't force the result of adding two sets to be a Union (in particula…
dpvc Aug 29, 2016
9226dcc
Merge pull request #281 from dpvc/issue280
goehle Aug 30, 2016
5f5f3a1
Fix issue with radio buttons not giving an erro if the index is out o…
dpvc Aug 31, 2016
d92a4e1
Merge pull request #283 from dpvc/patch-radiobuttons
goehle Sep 1, 2016
b8ac341
Replace "cellspacing" with css.
goehle Sep 2, 2016
a96c29e
Merge branch 'niceTablesPatch' into develop
mgage Dec 11, 2016
734c464
Merge branch 'MBX-mods-to-PGbasicmacros' into develop
mgage Dec 11, 2016
dc9e378
Merge pull request #291 from mgage/develop_update1
mgage Dec 11, 2016
73beceb
Extend capabilities
paultpearson Jan 12, 2017
615e532
spelling typo in hash key
Alex-Jordan Jan 20, 2017
ffeb553
Merge pull request #295 from Alex-Jordan/associativity
dpvc Jan 20, 2017
0aa17af
fix perl warning in contextLimitedFactor.pl
bldewolf Sep 22, 2016
b82fabc
Resolve perl warnings
bldewolf Sep 28, 2016
07d8e0e
Fix perl warnings
bldewolf Sep 28, 2016
48e8e5d
Fix perl warnings
bldewolf Sep 28, 2016
d86fe41
Fix perl warnings
bldewolf Sep 30, 2016
1201f04
Fix perl warnings
bldewolf Oct 3, 2016
c113e49
Fix perl warnings
bldewolf Oct 7, 2016
9c84a13
Update "true" values to 1
bldewolf Jan 20, 2017
d035320
Add blank lines
paultpearson Jan 20, 2017
c954195
Add blank lines and documentation
paultpearson Jan 20, 2017
7f6dae7
Merge pull request #296 from paultpearson/develop
dpvc Jan 21, 2017
1340917
add maketext calls in contextPiecewiseFunction.pl
heiderich Apr 6, 2017
51fbdf2
Merge pull request #297 from heiderich/maketext
mgage Apr 9, 2017
5bd5fed
white space changes
mgage May 21, 2017
d92b167
Reword warnings
mgage May 21, 2017
9876319
Core fix for multiAnswer bug.
mgage May 21, 2017
afe0975
Update documentation
mgage May 23, 2017
d22680a
add maketext calls in lib/Value/Interval.pm
heiderich May 25, 2017
95eabc7
Merge pull request #300 from heiderich/maketext_in_Interval_pm
mgage May 25, 2017
5df2b3b
Revert "add maketext calls in lib/Value/Interval.pm"
mgage May 25, 2017
0001567
Merge pull request #301 from openwebwork/revert-300-maketext_in_Inter…
mgage May 25, 2017
5bbefa4
Correct passing answer_group_name. This now appears to work for all …
mgage Jun 6, 2017
8b52ed2
Merge pull request #302 from mgage/develop_multiAnswer_fix
pstaabp Jun 16, 2017
9f092be
Merge pull request #290 from bldewolf/fix-perl-warnings
pstaabp Jun 22, 2017
aa8c8bc
A tweak to the css
pstaabp Jun 22, 2017
d2ef191
fixes an encoding error.
pstaabp Jun 22, 2017
81e02a6
Merge pull request #303 from pstaabp/cellspacing
mgage Jun 23, 2017
72c3c77
fix bug 3845 as proposed in the bug report: http://bugs.webwork.maa.o…
heiderich Jun 26, 2017
58b7416
add maketext calls
heiderich Jun 26, 2017
d2f60af
Fix bullet types for bullet and numeric lists.
dpvc Jun 30, 2017
6d4bb17
Make alpha and roman lists work better together.
dpvc Jun 30, 2017
ad04e7a
Make sure L is part of roman lists (who knew people would want more t…
dpvc Jun 30, 2017
4973307
Merge branch 'PGML-lists' into PGML-fixes
dpvc Jun 30, 2017
ed18ffd
Add PGML() function to make formatting partial strings easier.
dpvc Jun 30, 2017
7df6dd2
Fix typos, and make Unions report uncombined sets
dpvc Jul 1, 2017
5ac0e4f
Convert vectors to column matrices for normalize, solve_LR, and other…
dpvc Jul 1, 2017
a4a6bcc
Add differentiation to fractions, and add cmp_defaults to Real replac…
dpvc Jul 2, 2017
4248bc0
Merge pull request #304 from heiderich/compound_problem_fix_and_maketext
mgage Jul 7, 2017
32c47ea
Merge pull request #305 from dpvc/PGML-fixes
mgage Jul 7, 2017
7bddd8a
Merge pull request #306 from dpvc/misc-fixes
mgage Jul 7, 2017
8f22d5f
Merge pull request #307 from dpvc/matrix-fix
mgage Jul 7, 2017
2da8143
Merge pull request #308 from dpvc/fraction-fix
mgage Jul 7, 2017
d497551
Update version numbers and copyright for 2.13
mgage Jul 7, 2017
d60489f
Fix problem reported by Alex at https://github.com/openwebwork/pg/com…
dpvc Jul 11, 2017
aa85778
Merge pull request #311 from dpvc/PGML-fix
mgage Jul 12, 2017
2945d3e
Update version number
mgage Jul 14, 2017
a2dde28
Merge pull request #312 from mgage/PG-2.13_update_version
mgage Jul 15, 2017
29080bb
Fix error with checking for uncombined sets.
dpvc Jul 20, 2017
734dfca
Merge pull request #315 from dpvc/union-patch
mgage Jul 25, 2017
73356d1
Merge branch 'master' into PG-2.13
mgage Jul 25, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions macros/parserFormulaWithUnits.pl
Original file line number Diff line number Diff line change
@@ -73,18 +73,24 @@ =head1 USAGE
# Now uses the version in Parser::Legacy::NumberWithUnits
# to avoid duplication of common code.
#
our %fundamental_units = %Units::fundamental_units;
our %known_units = %Units::known_units;

sub _parserFormulaWithUnits_init {
# We make copies of these hashes here because these copies will be unique to # the problem. The hashes in Units are shared between problems. We pass
# the hashes for these local copies to the NumberWithUnits package to use
# for all of its stuff.
my %fundamental_units = %Units::fundamental_units;
my %known_units = %Units::known_units;


Parser::Legacy::ObjectWithUnits::initializeUnits(\%fundamental_units,\%known_units);

main::PG_restricted_eval('sub FormulaWithUnits {Parser::Legacy::FormulaWithUnits->new(@_)}');
}

sub parserFormulaWithUnits::fundamental_units {
return \%fundamental_units;
}
sub parserFormulaWithUnits::known_units {
return \%known_units;
}
1;
19 changes: 16 additions & 3 deletions macros/parserNumberWithUnits.pl
Original file line number Diff line number Diff line change
@@ -67,17 +67,30 @@ =head1 DESCRIPTION

loadMacros('MathObjects.pl');

our %fundamental_units = %Units::fundamental_units;
our %known_units = %Units::known_units;

sub _parserNumberWithUnits_init {
# We make copies of these hashes here because these copies will be unique to # the problem. The hashes in Units are shared between problems. We pass
# the hashes for these local copies to the NumberWithUnits package to use
# for all of its stuff.
my %fundamental_units = %Units::fundamental_units;
my %known_units = %Units::known_units;


Parser::Legacy::ObjectWithUnits::initializeUnits(\%fundamental_units,\%known_units);
# main::PG_restricted_eval('sub NumberWithUnits {Parser::Legacy::NumberWithUnits->new(@_)}');

main::PG_restricted_eval('sub NumberWithUnits {Parser::Legacy::NumberWithUnits->new(@_)}');
}
sub NumberWithUnits {Parser::Legacy::NumberWithUnits->new(@_)};
sub parserNumberWithUnits::fundamental_units {
return \%fundamental_units;
}
sub parserNumberWithUnits::known_units {
return \%known_units;
}
sub parserNumberWithUnits::add_unit {
my $newUnit = shift;
my $Units= Parser::Legacy::ObjectWithUnits::add_unit($newUnit->{name}, $newUnit->{conversion});
return %$Units;
}

1;