{"commit":"e2939c02ee284145ed353803d7a5424033e17e80","subject":"Zpl template utf-8 for gls","message":"Zpl template utf-8 for gls\n","repos":"akretion\/roulier","old_file":"roulier\/carriers\/gls_fr\/templates\/zpl.zpl","new_file":"roulier\/carriers\/gls_fr\/templates\/zpl.zpl","new_contents":"^XA\n^CI28\n^FWN\n^FO50,80^GB825,0,15^FS\n^FO50,102^AE,90,37^FD$T110 ^FS\n^FO360,95^GB30,105,82,^FS\n^FO375,102^AG,90,22^FR^FD$T310 ^FS\n^FO475,102^AE,90,45^FD$T100 ^FS\n^FO645,95^GB195,105,105,^FS\n^FO650,102^AE,90,30^FR^FD$T101 ^FS\n^FO50,194^GB825,0,5^FS\n\n^FO50,203^A0,90,65^FD$T320 ^FS\n^FO213,203^AB,8,10^FD$T8951 ^FS\n^FO375,203^AB,8,10^FD$T8952 ^FS\n^FO675,203^AB,8,10^FDPRODUIT^FS\n^FO210,233^A0,60,50^FD$T330 ^FS\n^FO330,222^AB,12,15^FD$T8911 ^FS\n^FO520,222^AB,12,15^FD$T8912 ^FS\n^FO390,252^AB,20,15^FD$T8913 ^FS\n^FO675,233^A0,60,50^FD$T8900 ^FS\n^FO780,233^A0,60,50^FD$T8901 ^FS\n^FO50,279^GB8250,0,5^FS\n\n^FO50,282^GB30,0,6^FS\n^FO255,282^GB30,0,6^FS\n^FO50,282^GB0,30,6^FS\n^FO285,282^GB0,30,6^FS\n\n^FO90,320^BX,4,200^FD$T8902 ^FS\n\n^FO50,510^GB30,0,6^FS\n^FO255,510^GB30,0,6^FS\n^FO50,480^GB0,30,6^FS\n^FO285,480^GB0,31,6^FS\n\n^FO650,320^BX,4,200^FD$T8903 ^FS\n\n^FO50,515^GB825,0,5^FS\n^FO50,530^A0,60,40^FD$T500 ^FS\n^FO180,545^A0,30,20^FD$T510 ^FS\n^FO210,545^A0,30,20^FD$T540 ^FS\n^FO310,545^A0,30,20^FD$T541 ^FS\n^FO370,530^A0,60,45^FD$T530 ^FS\n^FO480,530^A0,60,45^FDKG^FS\n^FO540,545^A0,30,20^FD$T8904 ^FS\n^FO570,545^A0,30,20^FD\/^FS\n^FO580,545^A0,30,20^FD$T8905 ^FS\n^FO610,545^A0,30,20^FDRTG^FS\n^FO650,545^A0,30,20^FD$T520 ^FS\n^FO740,545^A0,30,20^FDV02-00^FS\n\n^FO50,590^GB825,0,5^FS\n^FO55,620^B2N,70^FD$T8717 ^FS\n\n^FO55,740^GB640,0,5^FS\n^FO55,762^A0,30,45^FD$T860 ^FS\n^FO55,800^A0,30,30^FD$T861 ^FS\n^FO55,845^A0,30,30^FD$T862 ^FS\n^FO55,890^A0,30,45^FD$T863 ^FS\n^FO55,930^A0,30,45^FD$T864 ^FS\n^FO55,970^A0,30,30^FD$T100 ^FS\n^FO150,970^A0,30,30^FD$T330 ^FS\n\n^FO55,1000^GB640,0,5^FS\n^FO55,1007^A0,20,20^FD$T8958 ^FS\n^FO150,1007^A0,20,20^FD$T8906 ^FS\n^FO560,1007^A0,20,20^FDColisage^FS\n^FO55,1035^A0,20,20^FDTel:^FS\n^FO150,1035^A0,20,20^FD$T871 ^FS\n^FO555,1035^A0,20,20^FD$T8904 ^FS\n^FO590,1035^A0,20,20^FD\/^FS\n^FO600,1035^A0,20,20^FD$T8905 ^FS\n^FO55,1060^A0,20,20^FDRef:^FS\n^FO150,1060^A0,20,20^FD$T8977 ^FS\n^FO55,1090^A0,20,20^FD$T8907 ^FS\n^FO230,1090^A0,20,20^FD\/^FS\n^FO240,1090^A0,20,20^FD$T8908 ^FS\n^FO525,1063^GB160,0,5^FS\n^FO525,1000^GB0,63,5^FS\n^FO55,1125^GB825,0,5^FS\n^FO690,740^GB0,390,5^FS\n^FO50,740^GB0,390,5^FS\n^FO870,535^GB0,585,5^FS\n\n^FO775,600^A0,30,20^FWR^FDExpediteur^FS^\n^FO750,600^A0,20,20^FDClient^FS^\n^FO750,750^A0,20,20^FD$T805 ^FS^\n^FO750,870^A0,20,20^FDContactId^FS^\n^FO750,970^A0,20,20^FD$T8914 ^FS^\n^FO722,600^A0,20,20^FD$T810 ^FS^\n^FO695,600^A0,20,20^FD$T821 ^FS^\n^FO695,675^A0,20,20^FD$T822 ^FS^\n^FO695,825^A0,20,20^FD$T823 ^FS^\n\n^XZ=\n","old_contents":"^XA\n^FWN\n^FO50,80^GB825,0,15^FS\n^FO50,102^AE,90,37^FD$T110 ^FS\n^FO360,95^GB30,105,82,^FS\n^FO375,102^AG,90,22^FR^FD$T310 ^FS\n^FO475,102^AE,90,45^FD$T100 ^FS\n^FO645,95^GB195,105,105,^FS\n^FO650,102^AE,90,30^FR^FD$T101 ^FS\n^FO50,194^GB825,0,5^FS\n\n^FO50,203^A0,90,65^FD$T320 ^FS\n^FO213,203^AB,8,10^FD$T8951 ^FS\n^FO375,203^AB,8,10^FD$T8952 ^FS\n^FO675,203^AB,8,10^FDPRODUIT^FS\n^FO210,233^A0,60,50^FD$T330 ^FS\n^FO330,222^AB,12,15^FD$T8911 ^FS\n^FO520,222^AB,12,15^FD$T8912 ^FS\n^FO390,252^AB,20,15^FD$T8913 ^FS\n^FO675,233^A0,60,50^FD$T8900 ^FS\n^FO780,233^A0,60,50^FD$T8901 ^FS\n^FO50,279^GB8250,0,5^FS\n\n^FO50,282^GB30,0,6^FS\n^FO255,282^GB30,0,6^FS\n^FO50,282^GB0,30,6^FS\n^FO285,282^GB0,30,6^FS\n\n^FO90,320^BX,4,200^FD$T8902 ^FS\n\n^FO50,510^GB30,0,6^FS\n^FO255,510^GB30,0,6^FS\n^FO50,480^GB0,30,6^FS\n^FO285,480^GB0,31,6^FS\n\n^FO650,320^BX,4,200^FD$T8903 ^FS\n\n^FO50,515^GB825,0,5^FS\n^FO50,530^A0,60,40^FD$T500 ^FS\n^FO180,545^A0,30,20^FD$T510 ^FS\n^FO210,545^A0,30,20^FD$T540 ^FS\n^FO310,545^A0,30,20^FD$T541 ^FS\n^FO370,530^A0,60,45^FD$T530 ^FS\n^FO480,530^A0,60,45^FDKG^FS\n^FO540,545^A0,30,20^FD$T8904 ^FS\n^FO570,545^A0,30,20^FD\/^FS\n^FO580,545^A0,30,20^FD$T8905 ^FS\n^FO610,545^A0,30,20^FDRTG^FS\n^FO650,545^A0,30,20^FD$T520 ^FS\n^FO740,545^A0,30,20^FDV02-00^FS\n\n^FO50,590^GB825,0,5^FS\n^FO55,620^B2N,70^FD$T8717 ^FS\n\n^FO55,740^GB640,0,5^FS\n^FO55,762^A0,30,45^FD$T860 ^FS\n^FO55,800^A0,30,30^FD$T861 ^FS\n^FO55,845^A0,30,30^FD$T862 ^FS\n^FO55,890^A0,30,45^FD$T863 ^FS\n^FO55,930^A0,30,45^FD$T864 ^FS\n^FO55,970^A0,30,30^FD$T100 ^FS\n^FO150,970^A0,30,30^FD$T330 ^FS\n\n^FO55,1000^GB640,0,5^FS\n^FO55,1007^A0,20,20^FD$T8958 ^FS\n^FO150,1007^A0,20,20^FD$T8906 ^FS\n^FO560,1007^A0,20,20^FDColisage^FS\n^FO55,1035^A0,20,20^FDTel:^FS\n^FO150,1035^A0,20,20^FD$T871 ^FS\n^FO555,1035^A0,20,20^FD$T8904 ^FS\n^FO590,1035^A0,20,20^FD\/^FS\n^FO600,1035^A0,20,20^FD$T8905 ^FS\n^FO55,1060^A0,20,20^FDRef:^FS\n^FO150,1060^A0,20,20^FD$T8977 ^FS\n^FO55,1090^A0,20,20^FD$T8907 ^FS\n^FO230,1090^A0,20,20^FD\/^FS\n^FO240,1090^A0,20,20^FD$T8908 ^FS\n^FO525,1063^GB160,0,5^FS\n^FO525,1000^GB0,63,5^FS\n^FO55,1125^GB825,0,5^FS\n^FO690,740^GB0,390,5^FS\n^FO50,740^GB0,390,5^FS\n^FO870,535^GB0,585,5^FS\n\n^FO775,600^A0,30,20^FWR^FDExpediteur^FS^\n^FO750,600^A0,20,20^FDClient^FS^\n^FO750,750^A0,20,20^FD$T805 ^FS^\n^FO750,870^A0,20,20^FDContactId^FS^\n^FO750,970^A0,20,20^FD$T8914 ^FS^\n^FO722,600^A0,20,20^FD$T810 ^FS^\n^FO695,600^A0,20,20^FD$T821 ^FS^\n^FO695,675^A0,20,20^FD$T822 ^FS^\n^FO695,825^A0,20,20^FD$T823 ^FS^\n\n^XZ=\n","returncode":0,"stderr":"","license":"agpl-3.0","lang":"Zimpl"} {"commit":"3fa3ad3eca56b62ef9c508dcab88bad51d50c0a6","subject":"- \"--\"","message":"- \"--\"\n","repos":"akretion\/roulier","old_file":"roulier\/carriers\/trs\/templates\/trs_generateLabel.zpl","new_file":"roulier\/carriers\/trs\/templates\/trs_generateLabel.zpl","new_contents":"^XA\n\n^FX Grand cadre\n^FO50,10^GB1000,1200,3^FS\n\n^FX Expediteur\n^CF0,40\n^FO70,20^FD{{ sender_address.companyName }}^FS\n^FO50,10^GB1000,50,3^FS\n\n^FX Num colis et poids\n^FO100,290^FDColis {{ parcel.reference }}^FS\n^FO100,340^FDPoids {{ parcel.weight }}^FS\n^FO80,270^GB180,120,3^FS\n\n^FX Adresse\n^FO320,130^FD{{ receiver_address.name }}^FS\n^FO320,190^FD{{ receiver_address.street1 }}^FS\n^FO320,250^FD{{ receiver_address.street2 }}^FS\n^FO320,310^FD{{ receiver_address.zipCode }}^FS\n^FO620,310^FD{{ receiver_address.city }}^FS\n^FO300,90^GB750,300,3^FS\n\n^FO320,410^FDTel: {{ receiver_address.phoneNumber }}^FS\n\n^FX Ref, commentaires\n^FO80,700^FDReference \/ Commentaires: ^FS\n^FO50,680^GB1000,0,3^FS\n\n\n^FX Code barre\n^BY3,1,150\n^FO80,480^B3^FD{{ parcel.barcode }}^FS\n\n\n^FX Departement\n^CF0,160\n^FO100,120^FD{{ receiver_address.dept }}}^FS\n^FO80,90^GB180,150,3^FS\n\n^XZ\n","old_contents":"^XA\n\n^FX Grand cadre\n^FO50,10^GB1000,1200,3^FS\n\n^FX Expediteur\n^CF0,40\n^FO70,20^FD{{ sender_address.companyName }}^FS\n^FO50,10^GB1000,50,3^FS\n\n^FX Num colis et poids\n^FO100,290^FDColis {{ parcel.reference }}^FS\n^FO100,340^FDPoids {{ parcel.weight }}^FS\n^FO80,270^GB180,120,3^FS\n\n^FX Adresse\n^FO320,130^FD{{ receiver_address.name }}^FS\n^FO320,190^FD{{ receiver_address.street1 }}^FS\n^FO320,250^FD{{ receiver_address.street2 }}^FS\n^FO320,310^FD{{ receiver_address.zipCode }}^FS\n^FO620,310^FD{{ receiver_address.city }}^FS\n^FO300,90^GB750,300,3^FS\n\n^FO320,410^FDTel: {{ receiver_address.phoneNumber }}^FS\n\n^FX Ref, commentaires\n^FO80,700^FDReference \/ Commentaires: ^FS\n^FO50,680^GB1000,0,3^FS\n\n\n^FX Code barre\n^BY3,1,150\n^FO80,480^B3^FD{{ parcel.barcode }}^FS\n\n\n^FX Departement\n^CF0,160\n^FO100,120^FD{{ receiver_address.dept }}}^FS\n^FO80,90^GB180,150,3^FS\n\n\n^XZ\n--","returncode":0,"stderr":"","license":"agpl-3.0","lang":"Zimpl"} {"commit":"f917d847ed8c54b4ffbbced9144ab4660420c789","subject":"Syntax changes","message":"Syntax changes\n","repos":"haskellcamargo\/extended-zpl-deprecated,haskellcamargo\/ExtendedZPL","old_file":"Main.zpl","new_file":"Main.zpl","new_contents":"Module main.\n\nDeclare\n\tentryPoint => {:main:}\n\tdate => {:2014\/12\/27:}.\n\nConst\n\thello => {:Hello World!:}\n\tsize => 90\n\tfont => True.\n\nImport\n\t^GB As graphic.box\n\t^SN As label.serialize.\n\nBlock helloWorld Where\n\tfield.origin(20,10)\n\tfont.config(D, font, size, 50)\n\tfield.data(hello):\/\n\nBlock main Where\n\tlabel.begin\n\t\t\n\t\t\n\tlabel.end.","old_contents":"declare\n @module {:HelloWorld:}\n, @date {:2014\/12\/26:}\n, @descr {:Simple hello world program in Extended ZPL:}.\n\nvariable\n $hello <- \"Hello World!\". % Comments are Erlang-like.\n\ndo\n :field-origin [20, 10]\n, :font-config [D, N, 90, 50]\n, :field-origin [$hello], \/.","returncode":0,"stderr":"","license":"mit","lang":"Zimpl"} {"commit":"ca9352b745f87c0c05bcc029332489af9fe9ae35","subject":"Use Text block for address Reduce size of comments Add reference1 fix zipcode","message":"Use Text block for address\nReduce size of comments\nAdd reference1\nfix zipcode\n","repos":"akretion\/roulier","old_file":"roulier\/carriers\/trs\/templates\/trs_generateLabel.zpl","new_file":"roulier\/carriers\/trs\/templates\/trs_generateLabel.zpl","new_contents":"^XA\n\n^FX Grand cadre\n^FO30,15^GB800,1200,3^FS\n\n^FX Expediteur\n^CF0,40\n^FO50,30^FD{{ from_address.company }}^FS\n^FO30,15^GB800,50,3^FS\n\n^FX Num colis et poids\n^FO60,290^FDColis {{ service.reference2 }}^FS\n^FO60,340^FDPoids {{ parcel.weight }}^FS\n^FO40,270^GB200,120,3^FS\n\n^FX Adresse\n^FO300,130^TB,480,120^FD{{ to_address.name }}^FS\n^FO300,220^TB,480,90^FD^FD{{ to_address.street1 }}^FS\n^FO300,300^TB,480,90^FD^FD{{ to_address.street2 }}^FS\n^FO300,380^FD{{ to_address.zip }}^FS\n^FO400,420^FD{{ to_address.city }}^FS\n^FO280,90^GB500,400,3^FS\n\n^FO300,510^FDTel: {{ to_address.phone }}^FS\n\n^FX Ref, commentaires\n^FO60,800^FDReference \/ Commentaires: ^FS\n^FO60,840^FD{{ service.reference1 }} ^FS\n^FO60,880^FD{{ service.reference3 }} ^FS\n^FO30,780^GB800,0,3^FS\n\n\n^FX Code barre\n^BY3,1,150\n^FO60,580^B3^FD{{ service.shippingId }}^FS\n\n\n^FX Departement\n^CF0,160\n^FO60,100^FD{{ to_address.dept }}^FS\n^FO40,90^GB200,150,3^FS\n\n^XZ\n","old_contents":"^XA\n\n^FX Grand cadre\n^FO30,15^GB800,1200,3^FS\n\n^FX Expediteur\n^CF0,40\n^FO50,30^FD{{ from_address.company }}^FS\n^FO30,15^GB800,50,3^FS\n\n^FX Num colis et poids\n^FO60,290^FDColis {{ service.reference2 }}^FS\n^FO60,340^FDPoids {{ parcel.weight }}^FS\n^FO40,270^GB180,120,3^FS\n\n^FX Adresse\n^FO300,130^FD{{ to_address.name }}^FS\n^FO300,190^FD{{ to_address.street1 }}^FS\n^FO300,250^FD{{ to_address.street2 }}^FS\n^FO300,310^FD{{ to_address.zipCode }}^FS\n^FO400,310^FD{{ to_address.city }}^FS\n^FO280,90^GB500,300,3^FS\n\n^FO300,410^FDTel: {{ to_address.phone }}^FS\n\n^FX Ref, commentaires\n^FO60,700^FDReference \/ Commentaires: ^FS\n^FO60,740^FD{{ service.reference3 }} ^FS\n^FO30,680^GB800,0,3^FS\n\n\n^FX Code barre\n^BY3,1,150\n^FO60,480^B3^FD{{ service.shippingId }}^FS\n\n\n^FX Departement\n^CF0,160\n^FO60,100^FD{{ to_address.dept }}^FS\n^FO40,90^GB180,150,3^FS\n\n^XZ\n","returncode":0,"stderr":"","license":"agpl-3.0","lang":"Zimpl"} {"commit":"5b3152d99d809495bb0e8b919a3edf9042a98db1","subject":"Create sample.zmpl","message":"Create sample.zmpl","repos":"JJ\/linguist,manveru\/linguist,meunierfrederic\/octocatlinguist,MahmoudFayed\/linguist,sebgod\/linguist,ilyes14\/linguist,wcandillon\/linguist,matt40k\/linguist,whitj00\/linguist,iblech\/linguist,douglas-larocca\/linguist,sebgod\/linguist,chiranjeevjain\/linguist,ammaraskar\/linguist,mattn\/linguist,c-lipka\/linguist,jjatria\/linguist,georgesuperman\/linguist,sebgod\/linguist,FStarLang\/linguist,FStarLang\/linguist,CoderXpert\/linguist,BerkeleyTrue\/linguist,adamkaplan\/linguist,SRI-CSL\/linguist,pcantrell\/linguist,github\/linguist,steventhanna\/linguist,chiranjeevjain\/linguist,CegepVictoriaville\/linguist,yyx990803\/linguist,alitalia\/linguist,adamkaplan\/linguist,assimovt\/ling-ist,MadcapJake\/linguist,pchaigno\/linguist,c-lipka\/linguist,CegepVictoriaville\/linguist,alvarotrigo\/linguist,christop\/linguist,ilyes14\/linguist,BerkeleyTrue\/linguist,Mx7f\/linguist,cokeboL\/linguist,sagar290\/linguist,iblech\/linguist,mcandre\/linguist,sebgod\/linguist,marcojonker\/test,kr\/linguist,stanhu\/linguist,sideci-sample\/sideci-sample-linguist,bluebear94\/linguist,a0viedo\/linguist,bluebear94\/linguist,christop\/linguist,ya7lelkom\/linguist,github\/linguist,cybernet14\/linguist,stanhu\/linguist,jjatria\/linguist,Rockyspade\/linguist,thejameskyle\/linguist,kyoungrok0517\/linguist,Mx7f\/linguist,JJ\/linguist,R4PaSs\/linguist,cybernet14\/linguist,thejameskyle\/linguist,cokeboL\/linguist,jtbandes\/linguist,steventhanna\/linguist,martynbm\/linguist,tschf\/linguist,hcatlin\/linguist,jrnold\/linguist,erkyrath\/linguist,wcandillon\/linguist,manveru\/linguist,yyx990803\/linguist,phpsgi\/linguist,R4PaSs\/linguist,erkyrath\/linguist,a0viedo\/linguist,0a-\/linguist,stanhu\/linguist,SRI-CSL\/linguist,github\/linguist,MahmoudFayed\/linguist,kyoungrok0517\/linguist,MostAwesomeDude\/linguist,yyx990803\/linguist,ya7lelkom\/linguist,seanders\/linguist,PsichiX\/linguist,nburkley\/linguist,whitj00\/linguist,mattn\/linguist,osorgin\/linguist,github\/linguist,PsichiX\/linguist,erkyrath\/linguist,mcandre\/linguist,ammaraskar\/linguist,hcutler\/linguist,CoderXpert\/linguist,Rockyspade\/linguist,scttnlsn\/linguist,martynbm\/linguist,matt40k\/linguist,yscho\/linguist,JJ\/linguist,stanhu\/linguist,scttnlsn\/linguist,MostAwesomeDude\/linguist,0a-\/linguist,meunierfrederic\/octocatlinguist,sideci-sample\/sideci-sample-linguist,tschf\/linguist,anhongyue\/test222,anhongyue\/test222,mwpastore\/linguist,jrnold\/linguist,jtbandes\/linguist,davidzchen\/linguist,yyx990803\/linguist,erkyrath\/linguist,hcatlin\/linguist,osorgin\/linguist,meunierfrederic\/octocatlinguist,seanders\/linguist,marcojonker\/test,phpsgi\/linguist,douglas-larocca\/linguist,ppaulweber\/github-linguist,pcantrell\/linguist,davidzchen\/linguist,hcutler\/linguist,JJ\/linguist,nburkley\/linguist,assimovt\/ling-ist,yscho\/linguist,MadcapJake\/linguist,ChaiScript\/linguist,ppaulweber\/github-linguist,pchaigno\/linguist,georgesuperman\/linguist,alvarotrigo\/linguist,pchaigno\/linguist,blakeembrey\/linguist,blakeembrey\/linguist,pchaigno\/linguist,alitalia\/linguist,kr\/linguist,mwpastore\/linguist,sagar290\/linguist","old_file":"samples\/zmpl\/sample.zmpl","new_file":"samples\/zmpl\/sample.zmpl","new_contents":"# Mini Manitoba Hydro LP Model\n# Written for zimpl 3.0.0a\n# Licensed under the MIT license\n# Developed for fun using publicly available sources.\n# This software comes with no guarantees and no claims that it is fit for any purpose.\n# john howard, 1 Dec 2009\n\n# Inflows:\n# CR churchill river\n# LT lower nelson tribs\n# SL south indian lake\n# RR red river\n# WR winnipeg river\n#\n# Major Storages:\n# LW lake winnipeg\n# CL cedar lake\n#\n# Controlled Channels:\n# MF missi falls\n# NT notigi\n# EC east channel\n# WC west channel\n#\n# Generation Projects:\n# GR grand rapids\n# JP jenpeg\n# KE kelsey\n# LN lower nelson projects\n\n# variables and constraints are named the following way:\n# Type Subtype 2LetterName Kind Modifier\n# (v|k) [c] (..) (q|i|o|p|v|e|s|hk|ss|tw|mb|rc|os|ur) [ Start | End | Max | Min | Adj | Fact | Offset ]\n\nparam kTS := 662;\nset sTime := { 1 .. kTS };\n\n# for 5 day averaging requires indices spaced 3 apart\nset sTime5 := { in sTime with t < (kTS - 1) and t mod 3 == 0 };\n\nparam kCMSd2KCFSdFact := 35.315 \/ 1000;\n\n# column 8 is month\nparam vMONTH[ sTime ] := read \"historical.csv\" as \"8n\" skip 1;\nset sMonth := { 1 .. 12 };\n\n#########################\n### Inital Conditions ###\n\n# South Indian Lake\nparam kSLeMin := 840.0;\nparam kSLeMax := 847.9;\nparam kSLssFactor := 283.7;\nparam kSLvMax := (kSLeMax - kSLeMin) * kSLssFactor;\n\n# Grand Rapids Pond (Cedar Lake)\nparam kGReMin := 830.0;\nparam kGReMax := 841.5;\nparam kGRssFactor := 330.9;\nparam kGRvMax := (kGReMax - kGReMin) * kGRssFactor;\n\n# Lake Winnipeg\nparam kLWeMin := 709.0;\nparam kLWeMax := 714.75;\nparam kLWssFactor := 3040.0;\nparam kLWvMax := (kLWeMax - kLWeMin) * kLWssFactor;\n\n# Kelsey Pond\nparam kKEeMin := 0.0;\nparam kKEeMax := 0.1; # as modelled\nparam kKEssFactor := 902.0;\nparam kKEvMax := (kKEeMax - kKEeMin) * kKEssFactor;\n\n# Storage at aggregate Lower Nelson Projects\nparam kLNeMin := 0.0;\nparam kLNeMax := 3.0; # as modelled\nparam kLNssFactor := 200.0;\nparam kLNvMax := (kLNeMax - kLNeMin) * kLNssFactor;\nparam kLNvStart := kLNvMax \/ 2;\n\n####################################################################\n### Churchill River through South Indian Lake and Notigi Control ###\n\nparam kNToMin := 15; # control discharge limits (KCFS)\nparam kNToMax := 35;\n\nparam kMFoMin := 0; # control discharge limits (KCFS)\nparam kMFoMax := 10; # as modelled\nparam kMFoFact := 0.001; # adjustments (calibrated for 92-94 peroid)\n\nvar vMFo[ sTime ] >= 1 <= kMFoMax; # Missi Falls acts as spill\nvar vNTo[ sTime ] >= kNToMin <= kNToMax;\nvar vSLv[ sTime ] >= 0 <= kSLvMax;\n\n# 2nd column for Churchill River\nparam vCRq[ sTime ] := read \"historical.csv\" as \"2n\" skip 1;\n\nparam kSLiAdj := 2.3; # adjustments (calibrated for 92-94 peroid)\nparam kSLvStart := kSLvMax \/ 2;\n\n# refill\nsubto kcSLvEnd: vSLv[ kTS ] >= kSLvStart;\n\n# change-in-storage + outflow == inflow\nsubto vcSLmb:\n\tforall in sTime do\n\t\tif ( t == 1 ) then\tvSLv[ 1 ] - kSLvStart + vMFo[ 1 ] + vNTo[ 1 ]\n\t\telse\t\t\t\tvSLv[ t ] - vSLv[ t - 1 ] + vMFo[ t ] + vNTo[ t ]\n\t\tend\n\t\t== kCMSd2KCFSdFact * vCRq[ t ] + kSLiAdj;\n\n# Notigi within-week outflow shaping\nparam kNTosFact := 0; # as modelled\nsubto vcNTosA: forall in sTime5 do vNTo[ t - 2 ] >= vNTo[ t ] - kNTosFact;\nsubto vcNTosB: forall in sTime5 do vNTo[ t - 2 ] <= vNTo[ t ] + kNTosFact;\nsubto vcNTosC: forall in sTime5 do vNTo[ t - 1 ] >= vNTo[ t ] - kNTosFact;\nsubto vcNTosD: forall in sTime5 do vNTo[ t - 1 ] <= vNTo[ t ] + kNTosFact;\nsubto vcNTosE: forall in sTime5 do vNTo[ t + 1 ] >= vNTo[ t ] - kNTosFact;\nsubto vcNTosF: forall in sTime5 do vNTo[ t + 1 ] <= vNTo[ t ] + kNTosFact;\nsubto vcNTosG: forall in sTime5 do vNTo[ t + 2 ] >= vNTo[ t ] - kNTosFact;\nsubto vcNTosH: forall in sTime5 do vNTo[ t + 2 ] <= vNTo[ t ] + kNTosFact;\n\n###########################################################\n### Sask River into Cedar Lake and through Grand Rapids ###\n\nparam kGRoMin := 5; # plant\/control discharge limits (KCFS)\nparam kGRoMax := 53;\nparam kGRsMin := 0;\nparam kGRsMax := 40;\nparam kGRpMax := 472; # generation limits (MW)\n\nvar vGRv[ sTime ] >= 0 <= kGRvMax;\nvar vGRs[ sTime ] >= kGRsMin <= kGRsMax;\nvar vGRo[ sTime ] >= kGRoMin <= kGRoMax;\nvar vGRp[ sTime ] >= 0 <= kGRpMax;\n\n# 1st column for Sask River\nparam vSKRq[ sTime ] := read \"historical.csv\" as \"1n\" skip 1;\n\nparam kGRhk := 9.2; # plant HK factors (MW\/KCFS)\nparam kGRiAdj := -0.6; # adjustments (calibrated for 92-94 peroid)\nparam kGRvStart := kGRvMax \/ 2;\n\n# refill\nsubto kcGRvEnd: vGRv[ kTS ] >= kGRvStart;\n\n# change-in-storage + outflow == inflow\nsubto vcGRmb:\n\tforall in sTime do\n\t\tif ( t == 1 ) then\tvGRv[ 1 ] - kGRvStart + vGRo[ 1 ] + vGRs[ 1 ]\n\t\telse\t\t\t\tvGRv[ t ] - vGRv[ t - 1 ] + vGRo[ t ] + vGRs[ t ]\n\t\tend\n\t\t== kCMSd2KCFSdFact * vSKRq[ t ] + kGRiAdj;\n\n# compute power from discharge\nsubto vcGRp:\n\tforall in sTime do\n\t\tvGRp[ t ] == kGRhk * vGRo[ t ];\n\n# Grand Rapids within-week outflow shaping\nparam kGRosFact := 10; # as modelled\nsubto vcGRosA: forall in sTime5 do vGRo[ t - 2 ] >= vGRo[ t ] - kGRosFact;\nsubto vcGRosB: forall in sTime5 do vGRo[ t - 2 ] <= vGRo[ t ] + kGRosFact;\nsubto vcGRosC: forall in sTime5 do vGRo[ t - 1 ] >= vGRo[ t ] - kGRosFact;\nsubto vcGRosD: forall in sTime5 do vGRo[ t - 1 ] <= vGRo[ t ] + kGRosFact;\nsubto vcGRosE: forall in sTime5 do vGRo[ t + 1 ] >= vGRo[ t ] - kGRosFact;\nsubto vcGRosF: forall in sTime5 do vGRo[ t + 1 ] <= vGRo[ t ] + kGRosFact;\nsubto vcGRosG: forall in sTime5 do vGRo[ t + 2 ] >= vGRo[ t ] - kGRosFact;\nsubto vcGRosH: forall in sTime5 do vGRo[ t + 2 ] <= vGRo[ t ] + kGRosFact;\n\n##############################################################################\n### Lake Winnipeg Storage as operated by JENPEG and effect of Each Channel ###\n\nparam kJPoMin := 0; # plant\/control discharge limits (KCFS)\nparam kJPoMax := 93;\nparam kJPsMin := 0; # plant\/control discharge limits (KCFS)\nparam kJPsMax := 9e9; # as modelled\nparam kJPpMax := 97; # generation limits (MW)\n\nvar vLWv[ sTime ] >= 0 <= kLWvMax;\nvar vECo[ sTime ] >= 0; # upper bound determined by rating curve\nvar vJPo[ sTime ] >= kJPoMin <= kJPoMax;\nvar vJPs[ sTime ] >= kJPsMin <= kJPsMax;\nvar vJPp[ sTime ] >= 0 <= kJPpMax;\n\n# 3rd column for Red River and 4th column for Winnipeg River\nparam vRRq[ sTime ] := read \"historical.csv\" as \"3n\" skip 1;\nparam vWRq[ sTime ] := read \"historical.csv\" as \"4n\" skip 1;\n\nparam kLWiAdj := 11.7; # adjustments (calibrated for 92-94 peroid)\nparam kLWvStart := kLWvMax \/ 2;\n\nparam kJPhk := 1; # plant HK factors (MW\/KCFS)\nparam kJPoNovMaxFact := 0; # curves\nparam kJPoNovMaxOffset := 0;\nparam kJPtwFact := 0; # TODO\nparam kJPtwOffset := 0;\n\n# refill\nsubto kcLWvEnd: vLWv[ kTS ] >= kLWvStart;\n\n# change-in-storage + outflow == inflow\nsubto vcLWmb:\n\tforall in sTime do\n\t\tif ( t == 1 ) then\tvLWv[ 1 ] - kLWvStart + vJPo[ 1 ] + vJPs[ 1 ] + vECo[ 1 ]\n\t\telse\t\t\t\tvLWv[ t ] - vLWv[ t - 1 ] + vJPo[ t ] + vJPs[ t ] + vECo[ t ]\n\t\tend\n\t\t== kCMSd2KCFSdFact * vRRq[ t ] + kCMSd2KCFSdFact * vWRq[ t ] + vGRo[ t ] + vGRs[ t ] + kLWiAdj;\n\n# compute power from discharge\nsubto vcJPp:\n\tforall in sTime do\n\t\tvJPp[ t ] == kJPhk * vJPo[ t ];\n\n# West Channel Max Discharge\nparam vWCoMax[ sMonth ] := <1> 8.6440678, <2> 7.79661017, <3> 7.11864407, <4> 6.61016949, <11> 10.3389831, <12> 9.3220339 default 12.5423729;\nsubto vJPoA:\n\tforall in sTime cross sMonth with m == vMONTH[ t ] do\n\t\tvJPo[ t ] <= vLWv[ t ] * vWCoMax[ m ] \/ kLWssFactor;\n\n# East Channel Discharge\nsubto vcECo:\n\tforall in sTime do\n\t\tvECo[ t ] == vLWv[ t ] * 4.67463938 \/ kLWssFactor; # convert q\/ft (from historical 92-94 period data) to q\/v\n\n# Jenpeg within-week outflow shaping\nparam kJPosFact := 2; # as modelled\nsubto vcJPosA: forall in sTime5 do vJPo[ t - 2 ] >= vJPo[ t ] - kJPosFact;\nsubto vcJPosB: forall in sTime5 do vJPo[ t - 2 ] <= vJPo[ t ] + kJPosFact;\nsubto vcJPosC: forall in sTime5 do vJPo[ t - 1 ] >= vJPo[ t ] - kJPosFact;\nsubto vcJPosD: forall in sTime5 do vJPo[ t - 1 ] <= vJPo[ t ] + kJPosFact;\nsubto vcJPosE: forall in sTime5 do vJPo[ t + 1 ] >= vJPo[ t ] - kJPosFact;\nsubto vcJPosF: forall in sTime5 do vJPo[ t + 1 ] <= vJPo[ t ] + kJPosFact;\nsubto vcJPosG: forall in sTime5 do vJPo[ t + 2 ] >= vJPo[ t ] - kJPosFact;\nsubto vcJPosH: forall in sTime5 do vJPo[ t + 2 ] <= vJPo[ t ] + kJPosFact;\n\n# Jenpeg intra-week shaping\nsubto vcJPosI: forall in sTime5 without { kTS - 2 } do vJPo[ t + 3 ] >= vJPo[ t ] - kJPosFact * 2;\nsubto vcJPosJ: forall in sTime5 without { kTS - 2 } do vJPo[ t + 3 ] <= vJPo[ t ] + kJPosFact * 2;\n\n#########################\n### Kelsey Operations ###\n\nparam kKEoMin := 0; # plant\/control discharge limits (KCFS)\nparam kKEoMax := 55.4;\nparam kKEsMin := 0; # as modelled\nparam kKEsMax := 9e9; # as modelled\nparam kKEpMax := 211; # generation limits (MW)\n\nvar vKEv[ sTime ] >= 0 <= kKEvMax;\nvar vKEs[ sTime ] >= kKEsMin <= kKEsMax;\nvar vKEo[ sTime ] >= kKEoMin <= kKEoMax;\nvar vKEp[ sTime ] >= 0 <= kKEpMax;\n\n# 5th column for Gunisao River\nparam vGUNq[ sTime ] := read \"historical.csv\" as \"5n\" skip 1;\n\nparam kKEhk := 3.8; # plant HK factors (MW\/KCFS)\nparam kKEiFact := 1; # adjustments (calibrated for 92-94 peroid)\nparam kKEtwFact := 0; # curves\nparam kKEtwOffset := 0;\nparam kKEiAdj := 3; # adjustments (calibrated for 92-94 peroid)\nparam kKEvStart := kKEvMax \/ 2;\n\n# refill\nsubto kcKEvEnd: vKEv[ kTS ] >= kKEvStart;\n\n# change-in-storage + outflow == inflow\nsubto vcKEmb:\n\tforall in sTime do\n\t\tif ( t == 1 ) then\tvKEv[ 1 ] - kKEvStart + vKEo[ 1 ] + vKEs[ 1 ]\n\t\telse\t\t\t\tvKEv[ t ] - vKEv[ t - 1 ] + vKEo[ t ] + vKEs[ t ]\n\t\tend\n\t\t== kKEiFact * kCMSd2KCFSdFact * vGUNq[ t ] + kKEiAdj + vECo[ t ] +\tvJPo[ t ] + vJPs[ t ];\n\n# compute power from discharge\nsubto vcKEp:\n\tforall in sTime do\n\t\tvKEp[ t ] == kKEhk * vKEo[ t ];\n\n#########################################################################\n### Lower Nelson Operations with inflows from Upper Nelson and Notigi ###\n\nparam kLNoMin := 0; # plant\/control discharge limits (KCFS)\nparam kLNoMax := 165.7;\nparam kLNsMin := 0; # plant\/control discharge limits (KCFS)\nparam kLNsMax := 150; # kpill limits (KCFS)\nparam kLNpMax := 3583; # generation limits (MW)\n\nvar vLNv[ sTime ] >= 0 <= kLNvMax;\nvar vLNs[ sTime ] >= kLNsMin <= kLNsMax;\nvar vLNo[ sTime ] >= kLNoMin <= kLNoMax;\nvar vLNp[ sTime ] >= 0 <= kLNpMax;\n\n# 6th column for Lower Nelson Tribs\nparam vLTq[ sTime ] := read \"historical.csv\" as \"6n\" skip 1;\n\nparam kLNhk := 21.7; # plant HK factors (MW\/KCFS)\nparam kLNiAdj := 5; # adjustments (calibrated for 92-94 peroid)\nparam kLTiFact := 3; # adjustments (calibrated for 92-94 peroid)\n\n# refill\nsubto kcLNvEnd: vLNv[ kTS ] >= kLNvStart;\n\n# Routed discharges from Notigi to Lower Nelson\nvar vNTor[ sTime ] >= 0;\nset sUIR := { 1, 2, 3, 4 };\nparam kNTur[ sUIR ] := <1> 0.0, <2> 0.05, <3> 0.80, <4> 0.15; # as modelled\nsubto vcNTorA:\n\tforall in sTime without { 1, 2, 3 } do\n\t\tvNTor[ t ] == vNTo[ t - 0 ] * kNTur[ 1 ] + vNTo[ t - 1 ] * kNTur[ 2 ] + vNTo[ t - 2 ] * kNTur[ 3 ] + vNTo[ t - 3 ] * kNTur[ 4 ];\n\n# change-in-storage + outflow == inflow\nsubto vcLNmb:\n\tforall in sTime do\n\t\tif ( t == 1 ) then\tvLNv[ 1 ] - kLNvStart + vLNo[ 1 ] + vLNs[ 1 ]\n\t\telse\t\t\t\tvLNv[ t ] - vLNv[ t - 1 ] + vLNo[ t ] + vLNs[ t ]\n\t\tend\n\t\t== kLTiFact * kCMSd2KCFSdFact * vLTq[ t ] + kLNiAdj + vNTor[ t ] + vKEo[ t ] + vKEs[ t ];\n\n# compute power from discharge\nsubto vcLNp:\n\tforall in sTime do\n\t\tvLNp[ t ] == kLNhk * vLNo[ t ];\n\n# Lowern Nelson within-week outflow shaping\nparam kLNosFact := 10; # as modelled\nsubto vcLNosA: forall in sTime5 do vLNo[ t - 2 ] >= vLNo[ t ] - kLNosFact;\nsubto vcLNosB: forall in sTime5 do vLNo[ t - 2 ] <= vLNo[ t ] + kLNosFact;\nsubto vcLNosC: forall in sTime5 do vLNo[ t - 1 ] >= vLNo[ t ] - kLNosFact;\nsubto vcLNosD: forall in sTime5 do vLNo[ t - 1 ] <= vLNo[ t ] + kLNosFact;\nsubto vcLNosE: forall in sTime5 do vLNo[ t + 1 ] >= vLNo[ t ] - kLNosFact;\nsubto vcLNosF: forall in sTime5 do vLNo[ t + 1 ] <= vLNo[ t ] + kLNosFact;\nsubto vcLNosG: forall in sTime5 do vLNo[ t + 2 ] >= vLNo[ t ] - kLNosFact;\nsubto vcLNosH: forall in sTime5 do vLNo[ t + 2 ] <= vLNo[ t ] + kLNosFact;\n\n# Lowern Nelson inter-week outflow shaping\nsubto vcLNosI: forall in sTime5 without { kTS - 2 } do vLNo[ t + 3 ] >= vLNo[ t ] - kLNosFact * 2;\nsubto vcLNosJ: forall in sTime5 without { kTS - 2 } do vLNo[ t + 3 ] <= vLNo[ t ] + kLNosFact * 2;\n\n########################################################\n\n# 7th column for Load\nparam vLOAD[ sTime ] := read \"historical.csv\" as \"7n\" skip 1;\nvar sLOAD >= 0;\nsubto vcLOAD:\n\tforall in sTime do\n\t\tvGRp[ t ] + vJPp[ t ] + vKEp[ t ] + vLNp[ t ] >= vLOAD[ t ];\n\nminimize kSPILL:\n\tsum in sTime do vMFo[ t ] +\n\tsum in sTime do vGRs[ t ] +\n\tsum in sTime do vJPs[ t ] +\n\tsum in sTime do vKEs[ t ] +\n\tsum in sTime do vLNs[ t ];\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'samples\/zmpl\/sample.zmpl' did not match any file(s) known to git\n","license":"mit","lang":"Zimpl"} {"commit":"a7294a40bf77d2818096c38f2223087ba04d85c1","subject":"Adding parse dynamic programming script","message":"Adding parse dynamic programming script\n\ngit-svn-id: e0d426d5bc6690521be35eb4f63eeada706d4dc7@49 0408881f-cb4b-4750-8b71-c94bcb194269\n","repos":"mgormley\/pacaya,mgormley\/pacaya","old_file":"scripts\/zimpl\/parse_dp.zpl","new_file":"scripts\/zimpl\/parse_dp.zpl","new_contents":"# ---------- Sets, Parameters, Weights ----------\nparam InputSent := \"input.sent\";\n\n# input.sent contains \" word\"\nset AllTokens := { read InputSent as \"<1n,2n>\" };\nset Sents := proj(AllTokens,<1>);\nset TempTokens := proj(AllTokens,<2>);\nset Tokens[ in Sents] := { in TempTokens with in AllTokens };\nparam Length[ in Sents] := max(Tokens[s]);\nparam Word[AllTokens] := read InputSent as \"<1n,2n> 3s\";\nset AllWords := { read InputSent as \"<3s>\" }; \n# This gives an error: set AllWords := {union in AllTokens: Word[s,i]};\n\ndo print AllTokens;\ndo print Sents;\ndo forall in Sents do print Tokens[s];\ndo forall in AllTokens do print Word[s,i];\n\n\n# The domain of Arcs is pairs of token indices\n# Don't allow the wall symbol (token 0) to have a parent\nset Arcs[ in Sents] := { in Tokens[s] * Tokens[s] with i != j};\nset TempArcs := union in Sents: Arcs[s];\nset AllArcs := { in Sents*TempArcs with in Arcs[s] }; # TODO: this should be horribly slow\n\n# The following 4 lines don't work\n# The domain of WordPairs is pairs of words\n#set Words[ in Sents] := { in AllWords with Word[s,i] == w};\n#set WordPairs[ in Sents] := Words[s] * Words[s];\n#set AllWordPairs := union in Sents: WordPairs;\n\n# input.chooseweights contains \" weight\"\nparam InputChooseWeights := \"input.chooseweights\";\nset AllWordPairs := { read InputChooseWeights as \"<1s, 2s>\" };\nparam ChooseWeight[AllWordPairs] := read InputChooseWeights as \"<1s, 2s> 3n\";\n\n# input.stopweights contains \" weight\" where 0\/1 is for adjacency\nparam InputStopWeights := \"input.stopweights\";\nset LR := {\"l\",\"r\"};\nset StopSet := AllWords * LR * {0, 1};\nparam StopWeight[StopSet] := read InputStopWeights as \"<1s,2s,3n> 4n\";\n\n# ---------- Dependency Tree Constraints ----------\nvar arc[AllArcs] binary;\n\n# Other tree constraints\n# Each node should have a parent (except the wall)\nsubto one_incoming_arc:\n forall in Sents:\n forall in { 1 to Length[s] }:\n\t sum in { 0 to Length[s] } with i != j: arc[s,i,j] == 1;\n\n# The wall has no incoming arcs\nsubto no_parent_for_wall:\n forall in Sents:\n forall in { 1 to Length[s] }: \n arc[s,i,0] == 0;\n\n# ==================================================\n# ==== Option 1: Projective parsing ====\n# O(n^2) constraints \n# If arc[s,i,j] == 1, then Word[s,i] must dominate all the children under that arc.\n# \n# This constraint ensures that Word[s,i] is an ancestor of each of the nodes under the arc.\nsubto proj_parse_dominate:\n forall in AllArcs with abs(i-j) > 1:\n vif arc[s,i,j] == 1 then \n (sum in {min(i,j) to max(i,j)}*{min(i,j) to max(i,j)} with k != l and i != l: arc[s,k,l]) == abs(i-j) \n end;\n\n# This constraint ensures that descendents of Word[s,i] are not parents of nodes outside the range [i,j]\nsubto proj_parse_no_illegal_parents:\n forall in AllArcs with abs(i-j) > 1:\n vif arc[s,i,j] == 1 then \n (sum in Arcs[s] with (k > min(i,j) and k < max(i,j)) and (l <= min(i,j) or l >= max(i,j)): arc[s,k,l]) == 0 \n end;\n\n# This constraint ensures that Word[s,i]'s parent is not among the nodes under the arc.\nsubto proj_parse_parent:\n forall in AllArcs:\n vif arc[s,i,j] == 1 then \n (sum in {min(i,j) to max(i,j)} with i != k: arc[s,k,i]) == 0 \n end;\n\n# ==== Option 2: Non-projective parsing ====\n# Flow Constraints for: B is connected\n# var flow[AllArcs] real >= 0;\n\n# subto flow_sum: \n# forall in Sents:\n# Length[s] == sum in { 1 to Length[s] }: flow[s,0,j];\n\n# subto flow_diff: \n# forall in Sents:\n# forall in { 1 to Length[s] }:\n# \t 1 == (sum in {0 to Length[s] } with i != j: flow[s,j,i])\n# \t - (sum in { 0 to Length[s] } with i != j: flow[s,i,j]);\n\n# subto flow_bound:\n# forall in AllArcs:\n# flow[s,i,j] <= Length[s] * arc[s,i,j];\n# ==================================================\n\n# ---------- DMV log-likelihood ----------\n\n# Supporting variables for DMV log-likelihood\n\nset AllTokensLR := AllTokens * LR;\n# number of arcs from to left\/right children\nvar numToSide[ in AllTokensLR] integer >= 0 <= Length[s];\n# whether a child was generate adjacent to the left\/right\nvar genAdj[AllTokensLR] binary;\n# number of non-adjacent arcs from to left\/right children\nvar numNA[ in AllTokensLR] integer >= 0 <= Length[s] - 1;\n\nsubto numToSideLeft:\n forall in AllTokens:\n numToSide[s,i,\"l\"] == sum in { 0 to i-1 }: arc[s,i,j];\n\nsubto numToSideRight:\n forall in AllTokens:\n numToSide[s,i,\"r\"] == sum in { i+1 to Length[s] }: arc[s,i,j];\n\nsubto genAdjLeftAndRight:\n forall in AllTokensLR: \n vif numToSide[s,i,lr] >= 1 then genAdj[s,i,lr] == 1 else genAdj[s,i,lr] == 0 end;\n\nsubto numNALeftAndRight:\n forall in AllTokensLR:\n vif numToSide[s,i,lr] - 1 > 0 then numNA[s,i,lr] == numToSide[s,i,lr] - 1 else numNA[s,i,lr] == 0 end;\n\nmaximize goal: \n (sum in AllArcs: arc[s,i,j] * log(ChooseWeight[Word[s,i],Word[s,j]]))\n + (sum in AllTokensLR: \n (genAdj[s,i,lr] * log(StopWeight[Word[s,i],lr,0])\n\t + (1 - genAdj[s,i,lr]) * log(StopWeight[Word[s,i],lr,1])\n\t + genAdj[s,i,lr] * log(1 - StopWeight[Word[s,i],lr,1])\n\t + numNA[s,i,lr] * log(1 - StopWeight[Word[s,i],lr,0]))\n );\n\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'scripts\/zimpl\/parse_dp.zpl' did not match any file(s) known to git\n","license":"apache-2.0","lang":"Zimpl"} {"commit":"48aac16c035f599fe128608e1f3b1c251bc45022","subject":"Adding junit test for infeasibility","message":"Adding junit test for infeasibility\n\ngit-svn-id: e0d426d5bc6690521be35eb4f63eeada706d4dc7@158 0408881f-cb4b-4750-8b71-c94bcb194269\n","repos":"mgormley\/pacaya,mgormley\/pacaya","old_file":"src\/edu\/jhu\/hltcoe\/ilp\/infeasible.zpl","new_file":"src\/edu\/jhu\/hltcoe\/ilp\/infeasible.zpl","new_contents":"var xvar integer >= 0;\nvar yvar integer >= 0;\n\nsubto addition: xvar + yvar >= 2;\nsubto subtraction: xvar - yvar >= 4;\n\nmaximize goal: 2*xvar + 3*yvar;\n\n\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'src\/edu\/jhu\/hltcoe\/ilp\/infeasible.zpl' did not match any file(s) known to git\n","license":"apache-2.0","lang":"Zimpl"}