Skip to content

Commit

Permalink
fix pytest issues
Browse files Browse the repository at this point in the history
  • Loading branch information
xinp-hub committed Jan 17, 2025
1 parent 9f26bb9 commit 7d8019c
Show file tree
Hide file tree
Showing 5 changed files with 348 additions and 222 deletions.
163 changes: 163 additions & 0 deletions definition_id_set.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
inclination
line_loss_coeff_A
c_pressure
plastic_limit
pid_result
coef_permeability_vert
HFFD
pore_pressure_equil
set_time
aggregate_flakiness_index
dry_density
frost_heave
aggregate_abrasion_value
cbr_0.2
horiz_stress_index
line_loss_r2
sleeve_friction
specific_gravity_bulk
coef_consolidation_vertical
syneresis_surface_area_normalized
water_depth_calc
p1_reading
effective_stress_vertical
aggregate_impact_value
mud_balance_density
mcv
water_depth_estimated
sulfate_content
compression_index
n60
inclination_x
dilation_angle
soil_moisture_content
volumetric_shrinkage
line_loss_coeff_B
a_pressure
slake_durability_index
p0_reading
vertical_stress_total
aggregate_elongation_index
t50
coef_permeability_corrected
Is
bleed
plasticity_index
pore_pressure_u1
modulus_youngs
flow_cone_time
coef_earth_pressure
sensitivity
friction_ratio
dilatometer_modulus
shore_hardness_value
marsh_funnel_time
aggregate_la_coefficient
friction_angle_residual
water_elev_calc
material_index
water_depth
poisson_ratio
coef_permeability_horiz
colloid_percent
delay
coef_uniformity
aggregate_crushing_value
schmidt_hardness_value
water_content_optimum
d30
p2_reading
unit_weight
tip_resistance_corrected
chalk_crushing_value
slump
LFFD
liquid_limit
recompression_index
percent_fines
percent_gravel
shrinkage
uscs_symbol_425
shear_strength_undrained_residual
coef_permeability
modulus_shear
flame_ionization_measurement
clay_percent_5_micron
consistency_index
uscs_symbol
compressive_strength_unconfined
chloride_content
bulk_density
washout_result
soil_type
aggregate_LA_abrasion_loss
rock_porosity
cohesion_peak
pore_pressure_est
d10
specific_gravity_apparent
water_elev
aggregate_polished_stone_value
soil_suction
tip_resistance
constrained_vert_modulus
conductivity
relative_density
dmt_tip_bearing
thrust
temperature
friction_angle_cv
limit_pressure
shear_strength_undrained
pore_pressure_u2
lugeon_value
water_content_natural
friction_angle_peak
percent_sand
liquid_limit_oven_dried
syneresis
p_wave_velocity
resistivity
cbr_0.1
water_elev_estimated
inclination_y
pen_increment
coef_curvature
ten_percent_fines_value
degree_of_saturation
b_pressure
d50
Is50
torque
insitu_horizontal_stress
point_load_test_index
shrinkage_limit
clay_percent_2_micron
aggregate_water_absorption
blow_count
LOI
pH
gel_time
aggregate_soundness_value
filtrate_volume
line_loss_coeff_C
shrinkage_ratio
ocr
d60
aggregate_la_wear_ratio
pressure_filtration_value
shear_strength_drained
n1_60
coef_consolidation_horiz
n_value
u50
shear_velocity
time
dry_density_max
cohesion_residual
redox_potential
specific_gravity_solids
pore_pressure_u3
non_plastic
preconsolidation_pressure
liquidity_index
4 changes: 2 additions & 2 deletions pydiggs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
For more information about DIGGS, visit: http://www.diggsml.org/
"""

from .pydiggs import Validator
from .pydiggs import validator

__all__ = ['Validator']
__all__ = ['validator']
10 changes: 5 additions & 5 deletions pydiggs/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import argparse
import sys

from pydiggs import Validator
from pydiggs import validator


def main():
Expand Down Expand Up @@ -42,17 +42,17 @@ def main():
args = parser.parse_args()

if args.command == 'schema_check':
validation = Validator(args.diggs_file[0])
validation = validator(args.diggs_file[0])
if args.schema_path is not None:
validation = Validator(args.diggs_file[0], schema_path=args.schema_path[0])
validation = validator(args.diggs_file[0], schema_path=args.schema_path[0])
validation.schema_check()

if args.command == 'schematron_check' and args.schematron_path is not None:
validation = Validator(args.diggs_file[0], schematron_path=args.schematron_path[0])
validation = validator(args.diggs_file[0], schematron_path=args.schematron_path[0])
validation.schematron_check()

if args.command == 'dictionary_check':
validation = Validator(args.diggs_file[0])
validation = validator(args.diggs_file[0])
validation.dictionary_check()


Expand Down
Loading

0 comments on commit 7d8019c

Please sign in to comment.