Skip to content

Commit

Permalink
**4.1.0**
Browse files Browse the repository at this point in the history
26/March/2020
        adding -o option for output filename (output will go to stdout if no output file given)
                changed test scripts to use -o option
        adding -ojson option for json output
                added regression test for -ojson option
        adding -onull option to output empty files / files too small as TNULL
  • Loading branch information
Jono authored and Jono committed Mar 25, 2020
1 parent 4c8d3c5 commit 6f560b2
Show file tree
Hide file tree
Showing 9 changed files with 6,643 additions and 110 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ cmake_minimum_required(VERSION 2.6)
project(TLSH)

set(VERSION_MAJOR 4)
set(VERSION_MINOR 0)
set(VERSION_PATCH 1)
set(VERSION_MINOR 1)
set(VERSION_PATCH 0)

# TLSH uses only half the counting buckets.
# It can use all the buckets now.
Expand Down
10 changes: 10 additions & 0 deletions Change_History.md
Original file line number Diff line number Diff line change
Expand Up @@ -489,3 +489,13 @@ version 4: adding version identifier to each digest: 'T1'
turing on T1 functionality by setting showvers=1 in main
updating regression tests to have T1 at the start of digests
</PRE>

**4.1.0**
<PRE>
26/March/2020
adding -o option for output filename (output will go to stdout if no output file given)
changed test scripts to use -o option
adding -ojson option for json output
added regression test for -ojson option
adding -onull option to output empty files / files too small as TNULL
</PRE>
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,14 @@ ATIS 2014, November, 2014, pages 199-210

# Current Version

**4.0.1**
**4.1.0**
<PRE>
26/March/2020
version 4: adding version identifier to each digest: 'T1'
turing on T1 functionality by setting showvers=1 in main
updating regression tests to have T1 at the start of digests
adding -o option for output filename (output will go to stdout if no output file given)
changed test scripts to use -o option
adding -ojson option for json output
added regression test for -ojson option
adding -onull option to output empty files / files too small as TNULL
</PRE>

# Change History
Expand Down
82 changes: 82 additions & 0 deletions Testing/exp/example_data.128.1.5.len.json_out_EXP
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{ "digests":[
{ "tlsh":"T11FA1B357F78913B236924271569EA6D1FB2C451C33668484552C812D33138B8C73FFCE", "file":"example_data/021106_yossivassa.txt" },
{ "tlsh":"T145D18407A78523B35A030267671FA2C2F725402973629B25545EB43C3356679477F7FC", "file":"example_data/0Alice.txt" },
{ "tlsh":"T1C8E1E8277B98A6255FA70063B70FBAE1F6618229332C9438084FB331178ADEE53B41D5", "file":"example_data/11-17-06_Academy.txt" },
{ "tlsh":"T1E951784702042376169012B1BA5A76EAF36092FC3311A595B4856235278F9F973763EF", "file":"example_data/1english-only.txt" },
{ "tlsh":"T106D29517F780237185070293B60E36FAB735C0F833D66460688DA22D6756E751B7BAEB", "file":"example_data/2005NISSE.txt" },
{ "tlsh":"T135214031F3C6AEA059EB1ABA870E8C4758D70024C63224B5D4C89354E46315D26BF736", "file":"example_data/2006-07_Resource_Brochure.txt" },
{ "tlsh":"T1C081B063DB6455D3411303561428A9FBE1369B047760286686FFA067B2DA70D823DEFF", "file":"example_data/2006_2007PhysicalEducationConceptMap.txt" },
{ "tlsh":"T1E222B667EB006374230721F2620F5283EF3E817A6265462A745DF36933E7690037F7AA", "file":"example_data/2007ShowcaseFilm_Package.txt" },
{ "tlsh":"T17E529567B7C413B61A93119266DD11E2E37A49BCB3718C61B04E8438235ECB7477B3EA", "file":"example_data/22-ppa-3rd_e2snewsletter_jun06.txt" },
{ "tlsh":"T14221519BD71126276E6282B9668A6A81FF08C5293735431AA0CE50002B17DAE67FA7D4", "file":"example_data/42nd_street.txt" },
{ "tlsh":"T1F502E727F36923366E020362E50EA1F1D76943BC935A4221454DE03C3276D6E5BBF6ED", "file":"example_data/5._.txt" },
{ "tlsh":"T17D514252EBC42331ABD704331B5E5786D319172DD3064C22BD4D82A42B864A91B3B7EC", "file":"example_data/7-prikaz-slozeno.txt" },
{ "tlsh":"T1E9E1B7BDEB0873EB275983DEB84150A09731C51453904A40391D7B3A135ABBA4FB7E79", "file":"example_data/AccessToNationalSportsCentresPassportScheme.txt" },
{ "tlsh":"T1EF71831FBB7D13058AC3A3956318C2D9BBBCC25DF3B5499132DE6118377A12D433A654", "file":"example_data/Adult-Sports.txt" },
{ "tlsh":"T1B6A2A377F38617A186C60116725A96DA9BBEC97C73114910E84C817EF30BA64433FBFA", "file":"example_data/AfghanistanLiteracyDiscussionPaper.txt" },
{ "tlsh":"T11971DA5BD348133621131373654F39EBEB18933C63274561487ED169335ACAD17B7AD8", "file":"example_data/BBVDlivepr.txt" },
{ "tlsh":"T11751C967C354133467220270AD2F3CEDF714917DA3568B20582AF42D372681B43375E9", "file":"example_data/BBVDpr.txt" },
{ "tlsh":"T129514417E3C8337006414292395E3AA5F627C4782368B938DD69C26FA325FA50376ADB", "file":"example_data/BENEFITS_OF_EXERCISE_for_the_manual.txt" },
{ "tlsh":"T1A812B413A70917721ED31250734F17FAABBA876C32144A55982CC12C1646DB8D7BFBFA", "file":"example_data/Call-for-abstracts.txt" },
{ "tlsh":"T13BC1985B330F037657B603A1424E43E173595E68733A9A54486B612B3387C5CE7BA3ED", "file":"example_data/ClaremontTrioBio0607.txt" },
{ "tlsh":"T15C62C717E78923B100070266320F39D3A73EC678B22556147C9D919E7389E7D177BBE6", "file":"example_data/CommandGde.txt" },
{ "tlsh":"T123E181177B1533304A4301C27D5A10E6E77AA578B35A1A01B0FEC11457EACAB9B3BBF9", "file":"example_data/DOC-DHHS_Joint_Action_Plan_summary.txt" },
{ "tlsh":"T189A1B98BE70413734A820238F5AE5697FBA5846673139D94D4AC607D321287983FFFA9", "file":"example_data/DanceFestOMAIPressReleaseFeb15_07.txt" },
{ "tlsh":"T1BDC1B61FC71C22350EB20A7B324C36D8AE7B88690245ED75CD1CD11D3365BEE427E6A5", "file":"example_data/ExercisePocketSliderText.txt" },
{ "tlsh":"T199F1EA07E70927351B2301E2AA0F61E3FB589458736AC9054C5EB12133C3DAD937EEE9", "file":"example_data/FF06_press_9-7.txt" },
{ "tlsh":"T1D7D1E727E748377142220064964DB1F5ABAD963833210DB5349D823E238EDBE837F7D9", "file":"example_data/Fitness_Myths.txt" },
{ "tlsh":"T11061964BF2C4223767037275A14B22CCAB7C5934E3245519D4ED51AC9312FA98B3BEE8", "file":"example_data/Global_Warming_Resolution_April_2001.txt" },
{ "tlsh":"T1AD82B823A25013B51AD3017371DD2AD1F37AC1ACA3253C85648DC53C2B57AB9933A7EB", "file":"example_data/GovernorsTaskForceReport.txt" },
{ "tlsh":"T13B71D867960813745AD201D290591CC2932EC22836E1C5A470CF9ACC1B2F8FDD7FBAE1", "file":"example_data/Groove_Yard.txt" },
{ "tlsh":"T1A7B10837B36C23315F0302B53589A1E6FB78854A33BA8E58C41E926533428F447BA3CD", "file":"example_data/HSCPR10306.txt" },
{ "tlsh":"T1C7D1B73FEB482735479100A57B4D3ED6E7258A3833367AB2AC5CD15C132B67906721F6", "file":"example_data/HandoutSportsInjuryPrevention.txt" },
{ "tlsh":"T18292E81BFB4423351B1341F2111D79CBBB28436CB3624D34789D9269278296C97FEBEA", "file":"example_data/IntlChildrensFestRevisedRelease.txt" },
{ "tlsh":"T198028597735813360E564221A68D63D2F328C83A73BF8B2550BDA16C3687C6953FB5EC", "file":"example_data/LOTRLeadRelease.txt" },
{ "tlsh":"T111A1A52753E603564767032A699EB2D3B325813C6150C964306C6BAD37829B483BF9EA", "file":"example_data/Landau-Pickford-Press-Rel.txt" },
{ "tlsh":"T16861C707E729133966738191C24D27DBB76E5028A3298E5414D75ADB2391C6C933FFEC", "file":"example_data/Lotuspike-VBTD-Jenkins.txt" },
{ "tlsh":"T11582C4137B9833324B638255B10A1FD3A738D19433705CA4B8A9421867EFA7853F67EB", "file":"example_data/MEDT6491.txt" },
{ "tlsh":"T15181C72B571613399B63062B920DA5E17355C129333BCD0194FDE26C39178B9873DBEC", "file":"example_data/MRbio.txt" },
{ "tlsh":"T1F6626653A788337246920399AB1E57EAEB19D0BC23555934D8CC852C350AC6643FFFF5", "file":"example_data/Meeting_the_Challenges.txt" },
{ "tlsh":"T13722A417A7441F7212D32031764B2AEEE729C96CB3915C659889B12C131C775833BBEA", "file":"example_data/Memo_Ehrlich_1103.txt" },
{ "tlsh":"T1DAD1D82BFB2013660E520228F54E22E5EF798A791362A74178D5812C3396CBD27FD5F8", "file":"example_data/Midwestern_Rock_Garden.txt" },
{ "tlsh":"T1A271960B978527B58A6301F9166C25E5D399C92C332989208D19812D330AABD47BBFE6", "file":"example_data/Newsletter_20-1-3.txt" },
{ "tlsh":"T1F202E867DB81033449E242A7B14F25EBF725C1393211897470BED2E82359D2993FBAE8", "file":"example_data/Reviews-GrooveYard.txt" },
{ "tlsh":"T14FB1663FD308233447220276B64E61E5BB40D32DD3605572689E94BD33DAD7AD2772E8", "file":"example_data/SAR_Dog_Avalanche_promo.txt" },
{ "tlsh":"T10CB2F727B3D0272653E3016AD81516C3DA3B9149B3040975B47EC278278EB5B63BA7BF", "file":"example_data/SCE_3320.txt" },
{ "tlsh":"T1A161866FF77463B91F828264B19C18E09F6D85247BF680E5B02E536D038585A07FA7B8", "file":"example_data/Shopping.txt" },
{ "tlsh":"T1B65144DF581881590D92CEB572FEBBC5AA3201E0C0C586D4FC9D8CB12715A23B914FE1", "file":"example_data/SoundResources.txt" },
{ "tlsh":"T1F3C1722B67C823B156430214A51A95DAEF38E9283320A539FCDE446C3B1D6561B3BBB6", "file":"example_data/Summer_Math_Syllabus.txt" },
{ "tlsh":"T1DF12A57B778413B106B34504992D66EAE728C17923665C21F4CC826C370A9B647FEBF9", "file":"example_data/TeachingMathCameroon.txt" },
{ "tlsh":"T11BC150871A8433368ED351FCA23A18ACF3B1C5B9372A90554C4E4359B6999290B3F6F2", "file":"example_data/The-Global-Warming-Response-Act.txt" },
{ "tlsh":"T16DC1D787BB4413790F1102E1AA9E61E9F7500A75B3B24F24C4AED0642742C7E2BF97EC", "file":"example_data/WPTC2006Season.txt" },
{ "tlsh":"T1EA42C71FE64C233A09103236364F77DEAB27886CD3141A65AC1D925D3769F9E037A8E9", "file":"example_data/Week3.txt" },
{ "tlsh":"T1D252A527E74823210B530216761F76E6B73BC42D6315AE20E49DD26C2359E6807FBBDE", "file":"example_data/aReportOfTheSurgeonGeneral.txt" },
{ "tlsh":"T1BE22A522F35D13A58B518369911762D3BB71C249F3386A84C49FA2253747CE8827B7FA", "file":"example_data/ashaam2.txt" },
{ "tlsh":"T1F37197A7BB911376899301B1715E31F2FB68D17CA39991428C2DD1AC32638B9127FECD", "file":"example_data/billboard-021205.txt" },
{ "tlsh":"T1F271B567761C0379579203A3519F22F5AB20822C73B68E80405D64A57383A7CA6FEAFD", "file":"example_data/bio.txt" },
{ "tlsh":"T1F522E2336FC023568A838147758957EEF22DD9A833145645DC0783A9260F6F9A3BFEC6", "file":"example_data/cme2i05.txt" },
{ "tlsh":"T1FA120A3BE7450375C66B8281224E55D6B639815CF3768A111CAE9038378B467C77BBFC", "file":"example_data/didges_brew_band_info.txt" },
{ "tlsh":"T13A72A61BB35473B91BA38365225DAAF1D7364068B33A0964F46EC1202791C7693FE7EC", "file":"example_data/exploring_dallas.txt" },
{ "tlsh":"T1D3C1A363B355173A82930175626B36E1DBFF8474B3948905684DA2AC834AC68D33F7EE", "file":"example_data/exxonmobil_climate_change_backgrounder.txt" },
{ "tlsh":"T1CB42A653BB0C3337426362B59A5EB6D0F32A842CF3513A70845DD1A92385EB447B76DA", "file":"example_data/fitnessTerms.txt" },
{ "tlsh":"T1E112C61FE35033A00B2F4166B74626DAEB26022C73970969742D823C73A56AF533B7F5", "file":"example_data/gogirls.2003-10.txt" },
{ "tlsh":"T15942D71FA381233B496102B5770EA2CBEB15C0BC5369A571A45EC12E3367D7C937B9E8", "file":"example_data/greenhouse.txt" },
{ "tlsh":"T10292B51BF74413364D6731B1265FA5DFE72EC628F3650A71E8AC802C2258EA493363DD", "file":"example_data/lac_rfp_inner-cities.txt" },
{ "tlsh":"T1DEC1E60BB344033B4EE352D0318E05AEF7A9907957F2CA94D46CC0593A93C78617ABED", "file":"example_data/ledger091505.txt" },
{ "tlsh":"T161122097328C273521B3025B764FA4D6BB318465D30E4A0028ED99FC936BFA8D7372D9", "file":"example_data/modelgeneralnotice.txt" },
{ "tlsh":"T16B82C75FB74C13B229610595332FAAFAF723C1BC1316916C9C1D802C1365F6A927F6DA", "file":"example_data/parentarticle.txt" },
{ "tlsh":"T10171863E9341233EAB334611369C1FE3761C913AE322885574DD35282F5A62F9ABD3D9", "file":"example_data/record_voting.txt" },
{ "tlsh":"T1E2F1E60B638A3335682A4157B35F11EAB366A1247265C1E0905D333F23DDEEA813B7D7", "file":"example_data/rkc_flyer.txt" },
{ "tlsh":"T18541414FF38513711827423599BD78D37A78D378B304494550B884EA02A392A47FFBDC", "file":"example_data/sisters_pressrelease.txt" },
{ "tlsh":"T1F8A0220C0F8C0023CB880800CA33E88B8F0C022AB302C2008A030300300E8A00C83AAC", "file":"example_data/small.txt" },
{ "tlsh":"T1C6A022A2E0008CC320C083A3E20AA888022A00000A0AB0088828022A0008A00022F22A", "file":"example_data/small2.txt" },
{ "tlsh":"T1A592825B7B5952365703327AB1471ACE6625002DF212CC39A0A9AC383781D6DAFF278E", "file":"example_data/socy642_f02_milkie.txt" },
{ "tlsh":"T1E481852B33C423B545639375535F5AFBB74EC694421183F0A89EC43E735698C11B9AE8", "file":"example_data/spanish_place_namesA.txt" },
{ "tlsh":"T15C12E729F30903720143429821CF67F2B75691E8D2720365B86CCA3EF693EE951F4CEA", "file":"example_data/spanish_place_namesB.txt" },
{ "tlsh":"T11C52E827BB8813744A5303ABB60D39C1F76981BC7650A6A164DE925DB30EC740377BEA", "file":"example_data/sports_massage_and_recovery.txt" },
{ "tlsh":"T16A82C773A39423714BA30263A56E43D7F77F846C22698960A44DC13D624ADF4437FBEA", "file":"example_data/srilanka.txt" },
{ "tlsh":"T13602855BF340635353631252A22F8CDACB14F13DB3927931286CD13D2679E26477BBA6", "file":"example_data/survey_mathtch.txt" },
{ "tlsh":"T198A2C77FA280037117E30126755D9BCAF72A906C337548B9F85E507C331BA28677BBA6", "file":"example_data/syllabus.txt" },
{ "tlsh":"T15C32E96FF70463252A410264660E22DFE3A54038F3AD8B605C3E901403D6F9B5ABB7FE", "file":"example_data/victim.txt" },
{ "tlsh":"T15702A65FF780237092AA01D5670E21E2E36A942CB3265960945D922C3366FFD837B7FD", "file":"example_data/website_course_descriptors06-07.txt" }]
}
Loading

0 comments on commit 6f560b2

Please sign in to comment.